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

Re: Resoving tree conflicts results in inconsistent state between two working copies of same branch

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 19 Aug 2011 00:44:40 +0200

On Thu, Aug 18, 2011 at 10:02:45PM +0000, David Wallace wrote:
> Ok, I've attached a filtered typescript in which I was able to
> reproduce the problem, using a subtree in our repository as if it was
> the full repository.

Thanks!

> I don't have a full reproduction script,
> because that would require me to (1) set up a new repository

You can create a temporary repository for experiments on the local
hard drive like this:

  svnadmin create /tmp/repos

and then check out a working copy:

  svn co file:///tmp/repos wc

There is no need to set it up a repository on your Subversion server
or even use your production repository for such things.

> and (2)
> parse the output from svn log to get the proper range of revision
> numbers to attach to subsequent commands. But this typescript should
> be pretty easy to follow manually.

It is quite long. At first glance it looks like a bug. I don't
know if it is a known bug. I'll try to find some time to look at
in detail next week.
Received on 2011-08-19 00:45:18 CEST

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