Aaaaah he sez. CVS update -j is more subtle than i thought. Although,
now that i think about it, it makes more sense. I thought a merge would
take all the differences between the 2 branches and try to merge them.
Is not so. The way merge works is it takes the changes made to the other
branch since its creation and trys to apply them to the current branch.
It turns out the line that was different had been added to the main
branch after the sub-branch was created, and therefore merging the
sub-branch back in had no affect on it. Quite cunning really, when you
know how it thinks.
Thanks to John and Kenn for their suggestions.
Steve
--
"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!
