[Gnu-arch-users] Re: simple merge?

[Stig Brautaset]

On Sep 14 2003, Dustin wrote:
> 
>       I've managed to create branches across archives and perform merges 
> using replay, but the docs for star-merge seem a bit complicated.
> 
>       What's the best and easiest way to take a spun-off branch and apply 
> the changes that have occurred in it back into the original tree?

There are many ways:

 o replay/update/commit: In the spun-off branch, replay/update from the
   `master' tree, then _commit this to the master tree_. (This can be
   done by setting the tree version to the master version before
   make-log/commit or by giving an extra argument to commit.)

 o join-branch/replay/update/commit: In the master tree:

        % tla join-branch spun-off-branch
        % tla replay version spun-off-branch

   then make-log and commit as usual.

 o Using star-merge: In the master tree:

        % tla star-merge spun-off-branch

   then commit as usual. 

I think that should do. I just hope I got the syntax right -- I agree
that star-merge help message is not the clearest I've seen...

Stig

-- 
brautaset.org