Re: cross-directory merge

[Kaz Kylheku]

On Wed, 9 Feb 2005, Adam Jenkins wrote:

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

This problem is tackled in Meta-CVS, by design.

-- 
Meta-CVS: the working replacement for CVS that has been stable since
2002.  It versions the directory structure, symbolic links and execute
permissions. It figures out renaming on import. Plus it babysits the kids
and does light housekeeping! http://freshmeat.net/projects/mcvs