On Sat, 19 Oct 2002, Justin Mason wrote: > > You were using CVS to do merges?! > > > > I wonder if Craig was doing that too. I always create diffs and use > > an editor, it didn't even occur to me that someone might be trusting > > CVS to get it right. ;-) > > I know, I know -- I'd been spoilt by several years of Clearcase (which > was goodish) then Perforce (which was just excellent). ;)
Using CVS for merges works fine in my experience. You just have to be sure to (1) maintain a completely independent sandbox for each branch -- don't try to switch among branches in the same sandbox; and (2) carefully check all regions marked as conflicts rather than just choosing what CVS labels as one branch or the other. Also, NEVER make edits to a file outside the sandbox and then copy it back into the sandbox. I've found that's the most likely cause of a backed-out commit: Updating and then copying in the file, rather than copying in the file and then updating. CVS doesn't detect a problem in the update-then- copy case, where some other source control systems may. However, I personally use the "cvs up -j" option mainly to move entire files from one branch to another. Intra-file merging I do with emacs, using VC and the ediff-revision command. ------------------------------------------------------- This sf.net email is sponsored by: Access Your PC Securely with GoToMyPC. Try Free Now https://www.gotomypc.com/s/OSND/DD _______________________________________________ Spamassassin-talk mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/spamassassin-talk
