Re: [Gnu-arch-users] join-branch and ancestry

2005-04-23 Thread martin f krafft
also sprach John A Meinel <[EMAIL PROTECTED]> [2005.04.23.0155 +0200]: > You're looking in the wrong place. If you merge with another tree, that > tree is a merge partner, not an ancestor. > An ancestor is only generated from either a normal commit (in which case > the previous patch is the ancesto

Re: [Gnu-arch-users] join-branch and ancestry

2005-04-22 Thread John A Meinel
martin f krafft wrote: Maybe I am misunderstanding something about join-branch and/or ancestry, but: I have a category with three branches: /---> foo upstream \---> bar I want to join foo into bar: /---> foo -\ upstream\ \\--> bar So I d

[Gnu-arch-users] join-branch and ancestry

2005-04-22 Thread martin f krafft
Maybe I am misunderstanding something about join-branch and/or ancestry, but: I have a category with three branches: /---> foo upstream \---> bar I want to join foo into bar: /---> foo -\ upstream\ \\--> bar So I do: $ baz