[Mailman-Developers] broken CVS!

[Thomas Wouters]

On Tue, Oct 03, 2000 at 03:20:16PM -0700, Dan Mick wrote:

> >     CVR> "/home/mailman/Mailman/Mailbox.py", line 43 <<<<<<<

> Yeah, I hate that CVS is so silent about that.  I've taken to
> doing "find . -type f | xargs grep '<<<<<'" every time I do
> "cvs update" (in a script).  The stuff it leaves behind is *clearly*
> not usable, so I think there should be a big huge warning when it
> happens, and even an "invoke $EDITOR on the manual-merge-needy".
> But that's me.

It is pretty loud about it, actually. My cvs client shows 3 or 4 lines for
each failed merge ;) What I usually do, is 'cvs update' twice, so the 'C'
stands out more the second time. Alternatively, you can look for .#-files,
which CVS creates for conflicts.

-- 
Thomas Wouters <thomas@xs4all.net>

Hi! I'm a .signature virus! copy me into your .signature file to help me spread!