tech-repository archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: git copies of cvs modules available



On Sat, Nov 07, 2009 at 11:37:55AM -0500, Greg A. Woods wrote:
 > For example with src/games/hunt/Makefile there's some really bizarre
 > confusion w.r.t. the vendor branch -- it is in an impossible state.
 > (revision 1.1 and revision 1.1.1.1 MUST always be identical!)

This is not true. The state of hunt/Makefile is what you get if you
cvs add and commit version 1.1, and then later on do a cvs import of
the same file, without explicitly merging. If you do the explicit
merge you get a version 1.2 that's identical to 1.1.1.1, but that
doesn't change 1.1. (I just tested this out in /tmp.)

I think the set of possible states is larger than you think :-)

-- 
David A. Holland
dholland%netbsd.org@localhost


Home | Main Index | Thread Index | Old Index