[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: How safely "move" files from one branch to the other?
From: |
Tyler |
Subject: |
Re: How safely "move" files from one branch to the other? |
Date: |
Fri, 18 Jun 2004 09:39:16 -0700 |
User-agent: |
Mutt/1.4.2.1i |
On Fri, Jun 18, 2004 at 02:48:42PM +0200, marko wrote:
> I've a directory with a few files. There exist 2 branches for this
> directory, say A and B.
>
> I checked out the branch A and committed the changes. Only then I noticed
> that I should have modified branch B instead.
>
> How do I safely "move" the files from branch A to branch B?
For a small change like this, it's easiest to:
- back out the changes from branch A
(in A sandbox)
cvs up -j[new rev] -j[previous rev] [list of files]
(verify changes and commit)
- merge changes into branch B
(in B sandbox)
cvs up -j[previous rev] -j[new rev] [list of files]
(verify changes and commit)
Note that [previous rev] and [new rev] can be tags, which may make the
process a little less cumbersome.
HTH,
tyler