cross-directory merge

[Adam Jenkins]

Hi All,

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.

Cheers
Adam

Important notice: This message is intended for the individual(s) and entity(s) addressed. The information contained in this transmission and any attached, may be confidential and may also be the subject of legal privilege, public interest immunity or legal professional privilege. Any review, retransmission, dissemination or other use of, taking of any action in reliance upon this information by person or entities other than the recipient is prohibited and requires authorization from the sender. If you are not the addressee indicated in this message (or responsible for delivery of the message to such person) you may not copy or deliver this message to anyone. In such cases you should destroy this message and kindly notify the sender by reply email.

WARNING: Although Infocomp has taken reasonable precautions so that no viruses are present in this e-mail, the company cannot accept responsibility for any loss or damage arising from the use of e-mail attachments.