<html>
<head>
<style>
.hmmessage P
{
margin:0px;
padding:0px
}
body.hmmessage
{
FONT-SIZE: 10pt;
FONT-FAMILY:Tahoma
}
</style>
</head>
<body class='hmmessage'>[tangent as usual :)]<BR>
I find the CVS usage model "ok", but I would like a choice of another one.<BR>
I would like to know there is a conflict before it changes any of my files, or AT LEAST the ones with conflicts.<BR>
And then I want to easily browse the conflicting changes, possibly applying them manually locally, so that CVS can do the merge automatically.<BR>
<BR>
In Perforce the way this works is it goes ahead and changes all the files with no merging at all to be done and then you have several choices for the merges and conflicts. You can accept the automatic ones, reviewing them or not before accepting them. For conflicts you can accept theirs or yours or bring up an editor with something like what CVS does, but you can also put it off a bit -- but can't commit (submit) before resolving. A missing or unclear thing though is if you can have it accept automatic merges within a file where possible, and then yours/theirs on the conflicts.<BR>
<BR>
Duh I just had a really obvious epiphany finally. I need to try out TortoiseCVS and its nearest competing Mac and Linux analogs. That'll probably make me much more satisified. :)<BR>
(Reminder to any other folks to try the GUIs if they aren't experts with the command line.)<BR>
TortoiseSVN has been nice to use for example.<BR>
<BR>
- Jay<BR><BR>
<HR id=stopSpelling>
<BR>
> Date: Sat, 12 Jan 2008 01:22:16 +0100<BR>> From: wagner@elegosoft.com<BR>> To: m3devel@elegosoft.com<BR>> Subject: Re: [M3devel] I need CVS help again<BR>> <BR>> Quoting "Rodney M. Bates" <rodney.bates@wichita.edu>:<BR>> <BR>> > I have gotten myself into this jam before, as a result of trying to<BR>> > develop/test on more than one local machine with more than one M3<BR>> > installation. I have more questions on how to figure out what happened<BR>> > and how to fix it.<BR>> ><BR>> > I did a cvs update when, I guess, I had local uncommitted edits.<BR>> > I got messages saying that changes were being merged and there were<BR>> > conflicts. For example, I now have local files named:<BR>> ><BR>> > .#m3-eval.c.1.12<BR>> > m3-eval.c<BR>> ><BR>> > and in CVS/Entries, the line:<BR>> ><BR>> > /m3-eval.c/1.14/Result of merge...<BR>> ><BR>> > Have I correctly surmised that this all means<BR>> ><BR>> > 1) prior to the update, CVS/Entries would have said:<BR>> ><BR>> > /m3-eval/c/1.12...<BR>> ><BR>> > meaning 1.12 was the last version cvs knew I had,<BR>> ><BR>> > 2) But my local m3-eval.c had local changes relative to 1.12,<BR>> ><BR>> > 3) And .#m3-eval.c.1.12 is a copy of that locally changed<BR>> > m3-eval.c, as it was prior to the cvs update,<BR>> <BR>> Yes, this should be your original file.<BR>> <BR>> > 4) The latest version cvs has in its repository is 1.14, and<BR>> <BR>> Yes.<BR>> <BR>> > 5) My current local m3-eval.c was generated by merging version<BR>> > 1.14 from the repository with what is now in .#m3-eval.c.1.12?<BR>> <BR>> Yes.<BR>> You should simply find the comflicts in m3-eval.c by looking for<BR>> lines with <<<< and ===== and >>>>.<BR>> Often they are easy to edit manually.<BR>> <BR>> > Is there a simple way to get cvs to diff between its stored<BR>> > version 1.12 and my .#m3-eval.1.12?<BR>> <BR>> You can checkout any version into your workspace and compare locally:<BR>> <BR>> cvs up -p -r 1.12 m3-eval.c > m3-eval.c.1.12<BR>> cvs up -p -r 1.14 m3-eval.c > m3-eval.c.1.14<BR>> <BR>> diff -u .m3-eval.c.1.12 \#m3-eval.1.12<BR>> ...<BR>> <BR>> HTH,<BR>> <BR>> Olaf<BR>> -- <BR>> Olaf Wagner -- elego Software Solutions GmbH<BR>> Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany<BR>> phone: +49 30 23 45 86 96 mobile: +49 177 2345 869 fax: +49 30 23 45 86 95<BR>> http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin<BR>> Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194<BR>> <BR><BR><br /><hr />Watch “Cause Effect,” a show about real people making a real difference. <a href='http://im.live.com/Messenger/IM/MTV/?source=text_watchcause' target='_new'>Learn more</a></body>
</html>