[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 14:41:51 -0400

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. 

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
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 20:42:15 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.