Merging problem (was Re: (no subject))

[Derek Robert Price]

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

Tyler wrote:

>address@hidden:~/src/sandbox/troscoe]$ cat test
>trunk line 1
><<<<<<< test
>=======
>branch line 1
>branch line 2
>
>>>>>>>>1.1.2.2
>
>
>
>Is there no way to take the delta between two revisions and merge those
>onto another branch? Do i have to merge the entire branch down if i want
>to do this?


Unfortunately, this is a limitation of diffutils, which CVS uses to do
merges.  You asked CVS to add a "branch line 2" after a line
containing "branch line 1" in a file containing only the "trunk line
1".  CVS, via diffutils, craps out and marks up the file in a way that
says, `"trunk line 1" was in both files and "branch line 1" and
"branch line 2" were in the second file, in this location and in this
order.  Deal with it, human.'  Then you need to deal with it.

I think, basically, if you were to talk to the folks on the
<address@hidden> mailing list, you would be told that the
situation was ambiguous and the best that can be done is to ask a
human to look at it, but feel free to try and persuade them
otherwise.  There's a web page describing the diffutils project here
<http://www.gnu.org/directory/GNU/diffutils.html>.  Feel free to
browse their documentation and mail archives for similar questions.

Derek

- --
                *8^)

Email: address@hidden

Get CVS support at <http://ximbiot.com>!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFAh8eGLD1OTBfyMaQRApA1AKDNVxmXqXE02FX0isj2u/1gCPxrgwCfV+7M
gTTAgFMnm11gzhGO9ImHRq4=
=gBfK
-----END PGP SIGNATURE-----