I'm hoping someone here can point out where i'm going wrong. I have
a cvs tree, with a main branch (blah), and a sub-branch (blah_test). I
want to merge the changes made in the sub-branch back into the main
branch. I'm doing as follows:
cvs co -r blah module
cvs update -dPj blah-test
CVS then tells me that it's merging the differences between the 2
branches into my local working directory. However, when i choose a file
that i know had a line removed in the -test branch, i see that the line
is still there. Doing a cvs diff shows that the file hasn't changed at
all, despite cvs claiming it merged the differences. Can anyone tell me
what i'm doing wrong?
"The Catholic Church may wish to consider conducting Mass in Pig Latin,
as it combines the solemnity of Latin with the accessibility of English."
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!