To: gnu-arch-users@gnu.org
From: Anand Kumria <wildfire@progsoc.org>
Date: Tue, 23 Nov 2004 01:38:09 +1100
Message-ID: <pan.2004.11.22.14.38.09.398098@progsoc.org>
References: <d888fa3a0411211848d7b69c3@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
User-Agent: Pan/0.14.2.91 (As She Crawled Across the Table (Debian GNU/Linux))
Subject: [Gnu-arch-users] Re: star-merge problem
Precedence: list
Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org
Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org
Status: RO
Content-Length: 1149
Lines: 27
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!


_______________________________________________
Gnu-arch-users mailing list
Gnu-arch-users@gnu.org
http://lists.gnu.org/mailman/listinfo/gnu-arch-users

GNU arch home page:
http://savannah.gnu.org/projects/gnu-arch/