Re: Rephrasing: question about merging branches

[Derek Robert Price]

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

David Wood wrote:

|Please correct me if I'm wrong. I _think_ this is the "greatest common
|ancestor" problem. And finding one is actually something CVS does for you
|- on the first mege (with a single -j). Which is usually OK in cases where
|a branch immediately "dies" (i.e. becomes dormant) afterwards.
|
|The problem is that CVS does not "remember" that a merge took place. After
|a merge, the "map" of ancestry that was built by branch operations is no
|longer correct. And from that point on, CVS relies on _you_ to find the
|GCA.


No.  The GCA has not changed and CVS determines it correctly.  You
simply no longer wish to merge from the GCA forward because some of
those changes were already merged to your destination (from another
branch and at your own request - CVS did nothing wrong) and you wish to
avoid conflicts.

Derek

- --
~                *8^)

Email: address@hidden

Get CVS support at <http://ximbiot.com>!
- --
82. Hold a hard drive to your ear -- listen to the C.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org

iD8DBQE/qRlZLD1OTBfyMaQRAktRAKCetmTi7rGBJ87mND6lK1RzAy+3PwCfZxRn
0puk73j1ydoalv5iv11ph/M=
=4TK0
-----END PGP SIGNATURE-----