Email sent with an example file. As I wrote initially, I think the CVS version should simply be ignored and shouldn't be reflected in the Perforce history.
Why wouldn't 1.12.2.2 also be BRANCH since the branch wouldn't have existed before that? Perhaps this is just semantics and the effect would be the same.
If the revision containing the (dead) branch has been ignored, when it come to process the subsequent revision there is no earlier history tying it back.
Do you know the sequence of CVS command to get into this state?
If you have a single RCS file or a small data set that demonstrates the issue, please email me at pallen@perforce.com
Please detail how you would expect the history to look in Perforce (e.g. annotated
p4 filelog
)Email sent with an example file. As I wrote initially, I think the CVS version should simply be ignored and shouldn't be reflected in the Perforce history.
Thank you, I have your email. Interesting comparison between 1.13.2.1 and 1.12.2.1.
As you say it would seem that 1.12.2.1 should be ignored and 1.12.2.2 the first ADD on that path. Where as 1.13.2.1 would be a BRANCH from 1.13.
Why wouldn't 1.12.2.2 also be BRANCH since the branch wouldn't have existed before that? Perhaps this is just semantics and the effect would be the same.
If the revision containing the (dead) branch has been ignored, when it come to process the subsequent revision there is no earlier history tying it back.
Do you know the sequence of CVS command to get into this state?
Unfortunately, no. I tried to recreate it but couldn't get the exact behavior. Here are the steps I tried:
mkdir /tmp/cvsroot
export CVSROOT=/tmp/cvsroot
mkdir /tmp/cvstest
cd /tmp/cvstest
cvs init
cvs checkout
cvs tag TMPLABEL
cvs tag -r TMPLABEL -b newbranch
cvs update -r newbranch
echo just testing > trouble.c
cvs add trouble.c
cvs ci -r newbranch trouble.c
cvs log trouble.c