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

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?

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2395207

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-15 20:41:28 CEST