Re: [Gnu-arch-users] Smart Merging with Multiple Branches From a Common Ancestor

[Robert Collins]

On Tue, 2003-09-09 at 09:05, John Goerzen wrote:
> Hi,
> 
> I'm going to try to explain this question that's a little fuzzy in my
> head as clearly as possible.  Please ask if I fail :-)
...
> Now, let's say I yet another developer.  I want to create a branch baz
> that contains the original plus the changes on foo and bar.  So, after
> setting up my archive, I might do this:
> 
> tla tag whatever--mainline--1 whatever--baz--1
> tla get whatever--baz--1 wc
> cd wc
> tla star-merge whatever--foo--1
> 
> What I want to do with that star-merge is merge in the changes on the
> foo branch into mine.  But it only complains that the two trees are
> unrelated (despite the fact that they do have a common ancestor).  I
> could use repay --exact to pull in certain patches, but that's a
> hassle since I'd have to do patch-4 and patch-5 manually.  What should
> I be doing?

Well, you need to join-branch to tell the target that it can pull from
the other ancestor. Once you've done that you can start merging. BTW,
you may like to read the IdempotentMerge page on the wiki, It discusses
this exact use case.

Rob
-- 
GPG key available at: <http://members.aardvark.net.au/lifeless/keys.txt>.

signature.asc
Description: This is a digitally signed message part