[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Problem with merge tracking in 1.5.0

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 7 Jul 2008 17:35:59 -0400

On Mon, Jul 7, 2008 at 2:41 PM, Mark Phippard <markphip_at_gmail.com> wrote:
> On Mon, Jul 7, 2008 at 10:20 AM, Colm Aengus Murphy
> <colm.murphy_at_s3group.com> wrote:
>> I committed all changes (including the change to the dir at the root of the
>> project). I can see the details of the merge using svn log -g (or using
>> Tortoise SVN repo browser).
>> The only difference between the two tests was that in the second test the
>> merged file had a conflict.
> Can you create a reproduction recipe? Ideally a script/batch file
> that creates a repository, loads initial content, and then runs the
> commands that leads to the problem.

It occurs to me that this is actually the expected behavior. Of
course it is not the ideal or desired behavior, but it is what we
would expect. I am going to try to put together a blog post that
explains in more detail and will post link when I have it.

You really need to delete and recreate branches after they are
reintegrated for merges to continue to DTRT.

Mark Phippard
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-07 23:36:22 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.