Message-ID: <41A1FA6F.4080203@panoramicfeedback.com>
Date: Mon, 22 Nov 2004 09:40:47 -0500
From: Aaron Bentley <abentley@panoramicfeedback.com>
User-Agent: Mozilla Thunderbird 0.5 (X11/20040309)
MIME-Version: 1.0
To: Alex Ng <alex.ng@gmail.com>
Subject: Re: [Gnu-arch-users] star-merge problem
References: <d888fa3a0411211848d7b69c3@mail.gmail.com>
In-Reply-To: <d888fa3a0411211848d7b69c3@mail.gmail.com>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Cc: gnu-arch-users@gnu.org
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: 997
Lines: 33
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!

If you've done any cherry-picking, this sort of behavior is to be 
expected.  Star-merge is nice, but it only works when each merge is a 
complete merge.  You might try replay --skip-present instead.

See here:
http://wiki.gnuarch.org/moin.cgi/Merging_20with_20Arch

Aaron

-- 
Aaron Bentley
Director of Technology
Panometrics, Inc.


_______________________________________________
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/