Title: RE: cross-directory merge
sounds great...does it work with standard cvs clients
-Original Message-
From: Kaz Kylheku [mailto:[EMAIL PROTECTED]]
Sent: Wednesday, February 09, 2005 12:16 PM
To: Adam Jenkins
Cc: 'info-cvs@gnu.org'
Subject: Re: cross-directory merge
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.
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 [EMAIL PROTECTED]
Lets say I have the following si
Title: cross-directory merge
Hi All,
Lets say I have the following situation
--->MYBRANCH
/
/
/
-->HEAD
