[Gnu-arch-users] Re: star-merge problem

[Anand Kumria]

On Mon, 22 Nov 2004 10:48:57 +0800, Alex Ng wrote:

> Could someone please help me with this problem?
> 
> I have a main development branch. I branched off a while back and made
> various changes on this sub-branch. On the main branch, other work was
> carried out which included the addition of a new directory.
> 
> Now, when I try to star-merge my changes from the sub-branch back into the
> main branch, the merge somehow tries to remove the new directory in the
> main branch!
> 
> Why is it doing this and how do I get around it?

Could you indicate:
        - version of tla (tla --version)
        - tla tree-version of both trees
        - tla ancestry of both trees
        - the actual star-merge command you ran

Cheers,
Anand
-- 
linux.conf.au 2005   -  http://lca2005.linux.org.au/  -  Birthplace of Tux
April 18th to 23rd   -  http://lca2005.linux.org.au/  -       LINUX
Canberra, Australia  -  http://lca2005.linux.org.au/  -    Get bitten!