Re: Merge issues.

[Mark D. Baushke]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Tawfik, Sameh E <address@hidden> writes:

> About a month ago I tagged the main line with
> "Release_2_2_0 " tag, and then from that tag I

Note: spaces are not really included in the tag name...

> made a new branch "Release_2_2_0_Branch".
> 
>  
> 
> Now, I'm trying to merge from the branch to the
> main line, 

Okay.

> but it seems either I'm using the wrong syntax
> to the update command or there is a bug in CVS?

You do not mention which version of cvs you are using and 
mind-reading on this as most other places, is not easy.

> 
>  
> 
> I'm using this command:
> 
>  
> 
> cvs update -kk -j Release_2_2_0  -j Release_2_2_0_Branch build.xml

Presuming you are in a checked out copy of the
main trunk, this is the correct syntax to use.

> 
>  
> 
> U build.xml
> 
> RCS file: /home/cvsroot/EuroSource/build.xml,v
> retrieving revision 1.7
> retrieving revision 1.7.2.2
> Merging differences between 1.7 and 1.7.2.2 into build.xml
> rcsmerge: warning: conflicts during merge

So, you have committed two patches in build.xml on
the Release_2_2_0_Branch and from your later
comment one patch on the main trunk.

> My questions are:
> 
>  
> 
> Q1. Are there any thing wrong with the above merge command? 

No.

> Or is there is any other command I should be
> using instead?

Not really. I suppose you could do something like:

    cvs diff -u -rRelease_2_2_0 -rRelease_2_2_0_Branch build.xml > pch
    patch < pch

but that will generate .rej files for the
conflicts rather than nice conflict markers

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

It did the merge and only complains about the
overlap where it does not know how to change the
file for you, so you will need to manually resolve the
differences between the conflict markers.

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

It was able to determine how to merge the other
lines without any problems.

> Why CVS did not report conflicts about all the
> modified lines between the branch line and the
> main line in build.xml file!

It should not need to do so.

        -- Mark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQFBotZU3x41pRYZE/gRAlpxAJ4869O4DkgrJuhwrcLFMU5XnAbGswCg0yBx
XcXl/zEy10AHSG5oBiR+hhY=
=98wv
-----END PGP SIGNATURE-----