Re: cross-directory merge

[Paul Sander]

CVS can't handle it.  For each file, you must identify the file/version
pairs for the common ancestor and two contributors, get them all into your
workspace, invoke diff3 with the proper incantation, and commit the result.

--- Forwarded mail from address@hidden

Lets say I have the following situation

        
----------------------------------------------------------->MYBRANCH
            /
          /
        /
-------------------------------------------------------------------------->HEAD

Where "MYBRANCH" is the production code (currently unders support) and HEAD
is the new development code base.  Lets again say I have to reorganise the
files (rename and move files and directories -- in particular, do a massive
java refactor) on HEAD.  Then lets say I have to do a bug fix on MYBRANCH,
and merge that bugfix down to HEAD to make sure it's been replicated.  How
would I go about doing my directory/file moves so that I could still do the
merge later.

Any suggestions as to how to accomodate this problem (and whether cvs can
handle it) would be appreciated.

--- End of forwarded message from address@hidden