[Mailman-Developers] broken CVS!

[Dan Mick]

> >>>>> "CVR" == Chuq Von Rospach <chuqui@plaidworks.com> writes:
> 
>     CVR> I just updated to the current CVS, and it's broken:
> 
>     CVR> Traceback (innermost last):
>     CVR>    File "/home/mailman/cron/qrunner", line 85, in ?  from
>     CVR> Mailman import MailList File
>     CVR> "/home/mailman/Mailman/MailList.py", line 45, in ?  from
>     CVR> Mailman.Archiver import Archiver File
>     CVR> "/home/mailman/Mailman/Archiver/__init__.py", line 17, in ?
>     CVR> from Archiver import * File
>     CVR> "/home/mailman/Mailman/Archiver/Archiver.py", line 33, in ?
>     CVR> from Mailman import Mailbox File
>     CVR> "/home/mailman/Mailman/Mailbox.py", line 43 <<<<<<<
>     CVR> Mailbox.py ^
>     CVR> SyntaxError: invalid syntax
> 
> When you updated, did you see a file that got checked out with a `C'
> status letter?  That means that something in your local version
> conflicts with some changes in the master copy, and CVS can't resolve
> it.  You have to resolve the conflicts manually.

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.