Re: Merging Question

[Tony Byrne]

>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:

The first time you import page1 into the vendor branch you will see:

acktest/page1   --->    1.1.1.1

in the repository.  The second import of page1 will give you

actest/page1    --->    1.1.1.2

and so on.  You can track what has changed in page1, between imports
with:

cvs diff -r1.1.1.1 -r1.1.1.2 page1

If on the other hand you modify page1 local to the repository, between
imports, then when you commit your own changes, they will be committed
on the trunk:

actest/page1    ---->   1.1

If you then do another import of page1 after it has been modified
externally, then you will need to merge your local changes 1.1.1.1 -->
1.1 and their external changes 1.1.1.1 --> 1.1.1.2 into the version on
the trunk.  You may or may not see a conflict depending on whether you
and the other team both modified the same set of lines.

Regards,

Tony.

--
==============================================================
Tony Byrne <address@hidden>, Swords, Co. Dublin, Ireland.
MP3 Musician http://www.mp3.com/tony_byrne
Get your copy of the Winamp MP3 player: http://www.winamp.com
==============================================================