> 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?
Maintained by the ILUG website team. The aim of Linux.ie is to
support and help commercial and private users of Linux in Ireland. You can
display ILUG news in your own webpages, read backend
information to find out how. Networking services kindly provided by HEAnet, server kindly donated by
Dell. Linux is a trademark of Linus Torvalds,
used with permission. No penguins were harmed in the production or maintenance
of this highly praised website. Looking for the
Indian Linux Users' Group? Try here. If you've read all this and aren't a lawyer: you should be!