In message <[EMAIL PROTECTED]> on Thu, 1 Sep 2005 16:40:45 +0200 (CEST), [EMAIL
PROTECTED] said:
ml-monotone> On 1 Sep, Richard Levitte - VMS Whacker wrote:
ml-monotone> > 'cvs import' does a merge into the main trunk by
ml-monotone> > default, unless it finds a conflict. That's when it
ml-monotone> > tells you to do a merging update, solve the conflicts
ml-monotone> > and commit.
[...]
ml-monotone> If I want to get the newest imported modifications of a
ml-monotone> file I modified on my own, I have to issue an "update
ml-monotone> -j", haven't I?
Only when there's a conflict between the vendor branch and the main
trunk. When that happens, you get this message:
{n} conflicts created by this import.
Use the following command to help the merge:
cvs checkout -j<prev_rel_tag> -j{current_rel_tag} project
Note "to help the merge"... Also, there's at least one file that has
been marked 'C' instead of 'U' or 'P'.
Cheers,
Richard
-----
Please consider sponsoring my work on free software.
See http://www.free.lp.se/sponsoring.html for details.
--
Richard Levitte [EMAIL PROTECTED]
http://richard.levitte.org/
"When I became a man I put away childish things, including
the fear of childishness and the desire to be very grown up."
-- C.S. Lewis
_______________________________________________
Monotone-devel mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-devel
