Re: [Gnu-arch-users] ancestry and star-merge

[Jan Hudec]

On Fri, Feb 20, 2004 at 18:48:53 +0100, Jean Helou wrote:
> re all,
> 
> The ancestry explanation in the tutorial is pretty short, I would like 
> to clear something up :
> 
> if I have the following (real world) situation:
> 
> test--jean--0.0.1         test--taff--0.0.1
> -----------------         --------------------
> base-0  ----------------->base-0
> 
> then I can say that test--jean--0.0.1--base-0 is an ancestor of 
> test--taff--0.0.1--base-0 right ?
> 
> now I also have the following :
> 
> test--jean--0.0.1         test--michel--0.1
> -----------------         --------------------
> base-0  ----------------->base-0
>                          patch-1
> 
> then test--jean--0.0.1--base-0 is also an ancestor of 
> test--michel--0.1--base-0
> therefore test--taff--0.0.1--base-0 and test--michel--0.1--base-0 
> _do_ have a common ancestor right ?
> (maybe I have to few patches ... ? :) )
> 
> yet if i do
> $tla get test--taff--0.0.1--base-0
> $cd test--taff--0.0.1--base-0
> $tla starmerge address@hidden/test--michel--0.1--base-0
> 
> I get :
> star-merge: unable to merge unrelated trees.

If you read the help message of star-merge, you will find, that
star-merge only looks for the ancestor in the two branches you are
trying to merge. You will also find, that you can tell it where to look
for the ancestor using the -r switch. Until someone writes complete
graph-analysing code, you will have to resolve manualy in these cases.

-------------------------------------------------------------------------------
                                                 Jan 'Bulb' Hudec 
<address@hidden>

signature.asc
Description: Digital signature