Re: Merging Question

[Alexander Kamilewicz]

Aha!  That makes considerably more sense than what I was trying to
figure out on my own.

Since changes generally haven't been made to the local repository
copies, there have been no conflicts, but the Vendor history _is_ being
kept.

Thanks so much for your answer - I feel a lot better about how I'm going
about this now.

And nice music, by the way.

Yours,
Alex

Tony Byrne wrote:
> 
> >However, the
> >crux of my problem was that whenever I've been importing their new
> >changes into a module, I _never_ get a conflict message.  This is
> >important, because in most cases I _know_ a file has changed (usually
> >index.htm).
> 
> Maybe I'm picking you up wrong in your description of the problem, but
> if you only ever import new versions of a file into a vendor branch,
> then I can't see how you would ever see a conflict.  If a file changes
> external to your CVS repository between any two imports, then the
> latter import will result in a new revision of the file being created
> along the vendor branch, with another revision number.    To use your
> example:

<snip>

-- 
This message is intended only for the use of the addressee(s) named
herein.  The information contained in this message is confidential and
may constitute proprietary or inside information.  Unauthorized review,
dissemination, distribution, copying or other use of this message,
including all attachments, is strictly prohibited and may be unlawful. 
If you have received this message in error, please notify us immediately
by return e-mail and destroy this message and all copies thereof,
including all attachments.