[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] ancestry and star-merge
From: |
Jean Helou |
Subject: |
[Gnu-arch-users] ancestry and star-merge |
Date: |
Fri, 20 Feb 2004 18:48:53 +0100 |
User-agent: |
Mozilla Thunderbird 0.5 (X11/20040209) |
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.
$tla ancestry test--taff--0.0.1
gives
address@hidden
test--taff--0.0.1
base-0 ... base-0
address@hidden
test--jean--0.0.1
base-0
$tla ancestry test--michel--0.1
gives
address@hidden
test--michel--0.1
patch-1 ... base-0
address@hidden
test--jean--0.0.1
base-0
signature.asc
Description: OpenPGP digital signature
- [Gnu-arch-users] ancestry and star-merge,
Jean Helou <=