Re: [Q] Vendor Branches and Updates

[Larry Jones]

John Muller writes:
> 
> This message is in MIME format. Since your mail reader does not understand
> this format, some or all of this message may not be legible.

Please do not send MIME and/or HTML encrypted messages to the list.
Plain text only, PLEASE!

> If I attempt to merge both of these files (in one import command).  What
> happens to file1?
> 
> 1) Does it become the head revision automatically?
> 2) Or does it have to be merged to become the head?

Just like it says in the manual:  For files that have not been modified
on the trunk, the newly-imported revision becomes the head revision
immediately.  For files that have been modified on the trunk, the
locally-modified revision stays the head revision and you have to
perform a merge to get the changes from the newly-imported revision.

> I would expect #2 to happen to prevent the main branch from getting partial
> updates, but based on the cvs documentation (see below) I'm not sure if this
> will happen.  Can someone clarify this?

It certainly would be nice if it worked that way, but it doesn't.

-Larry Jones

That gives me a FABULOUS idea. -- Calvin