[ILUG] cvs merge question...
kenn at bluetree.ie
Tue Dec 10 12:47:03 GMT 2002
> I'm insane already, but it doesn't seem to be affecting this. I've
> checked that, and it still tells me that there's one line more in the
> main branch than the sub-branch. Nargh.
Try explicitly specify the range on the sub-branch that you
want to merge:
cvs update -j blah-test:yesterday -j blah-test
If the change was in the last day. If you're tagging your branch
at strategic places:
cvs update -j blah-test:milestone1 -j blah-test:milestone2
Has the file been locally-modified already? What does
cvs status -v <file> show?
More information about the ILUG