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

Re: How is R - replace performed ?

From: Paul Hammant <paul_at_hammant.org>
Date: Mon, 21 Sep 2009 14:22:10 -0500

>> Will report back more today.z
> Yes, users should never see this. If it happens, it's a bug in the
> program. But the program needs to abort the merge because it's a
> situation it is unlikely to recover from.
> I've merged a fix for the missing '%s' in the "already exists" error
> message into the branch. So you should now see which file is causing
> the double tree conflict during the merge, with latest 1.6.x-r38000.
> Thanks for catching this!

We tried to kill (as near as we could get to obliterate) the R-
replaced directory, and though we could now merge past that, the merge
ends in exactly the same way some few minutes later.

As far as I can see we're out of options.

- Paul


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-21 21:23:33 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.