[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: Paul Hammant <paul_at_hammant.org>
Date: Wed, 16 Sep 2009 11:52:43 -0500

I'm finding that http://svn.collab.net/viewvc/svn/branches/1.6.x/ is
the most informative when trying to work through tree-conflict issues.

I see tree-conflict related changes 29 mins ago, so may try it again.

Regards,

- Paul

On Sep 16, 2009, at 10:49 AM, Stein Somers wrote:

>> svn diff http://svn.collab.net/repos/svn/branches/1.6.x@39163 \
>> http://svn.collab.net/repos/svn/branches/1.6.x-r38000 > 3.patch
>
> You've lost me somewhere there. Which is a good branch for users to
> investigate these aborting merges? 1.6.x_at_39163 1.6.x-r38000 or just
> 1.6.x?
>
> I tried using /trunk r39197, but that hangs midway checkout.
> I tried the latest /trunk, but it begs for a file wc-queries.h
>
> --
> Stein
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2395621
>
> To unsubscribe from this discussion, e-mail: [users-
> unsubscribe_at_subversion.tigris.org].
>

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

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