Re: Merge issues.

[Larry Jones]

Tawfik, Sameh E writes:
> 
> This is a multi-part message in MIME format.

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

> Q1. Are there any thing wrong with the above merge command? Or is there
> is any other command I should be using instead?

Looks right to me.

> Q2. The latest version in the main line is 1.8, so why it's not
> reporting merging between 1.7 and 1.7.2.2 instead of 1.8 and 1.7.2.2?

You're misinterpreting the message.  It's finding the changes between
Release_2_2_0 (1.7) and Release_2_2_0_Branch (1.7.2.2) and then merging
those changes into the current working directory revision (which is
presumably based on 1.8).

> Q3. I recently modified "build.xml" file in the main line, and I was
> expecting CVS to report conflicts about all the lines that I changed,
> but instead after the above merge, CVS showed only one line of conflict,
> and did not show conflicts in the other modified lines? Why CVS did not
> report conflicts about all the modified lines between the branch line
> and the main line in build.xml file!

Because those lines weren't changed on the branch.  You only get a
conflict if the same line is changed in both places; otherwise, CVS just
quietly merges the changes.

-Larry Jones

Well of course the zipper's going to get stuck if everyone
stands around WATCHING me! -- Calvin