Re: Is it possible to merge together two files that CVS does not reco ginize as the same?

[Eric Siegerman]

On Fri, May 11, 2001 at 12:52:46PM -0700, Charles Corley wrote:
> Our project is in a transitional state and a file has been copied from one
> module to another with some concurrent development taking place on both
> revisions of that file.  Now, the changes that were made to one copy need to
> be joined with those made in the other copy in a different module.

It might make sense to do this outside of CVS.  Get appropriate
versions of the file (the two diverged versions and the common
ancestor) and point diff3 at them.  ("diff3" is from GNU
diffutils; it's what CVS uses internally to do merges.)
Or instead of diff3, use a combination of diff and patch.

Then copy the already-merged version to the new sandbox location,
as you proposed, and procede from there.

--

|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.        address@hidden
|  |  /
With sufficient thrust, pigs fly just fine. However, this is not
necessarily a good idea.
        - RFC 1925 (quoting an unnamed source)