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

Re: back-end fsfs DB corruption? - attempt to merge uncovering it

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 15 Sep 2009 19:40:26 +0100

On Tue, Sep 15, 2009 at 01:29:34PM -0500, Paul Hammant wrote:
> Stefan,
> Building 1.6.x-r38000 (requires libtool install, sqllite stuff, etc)
> makes a Svn. Testing that one (again hard coded path), yields the
> same halt point:

Are you, by any chance, merging into a working copy which has the
conflict already recorded from a prior merge?
If so, does the merge work if you get a clean working copy and use
that to do the merge?



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