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

RE: Blank line in historic svn:mergeinfo

From: Grierson, David <David.Grierson_at_sky.uk>
Date: Fri, 12 Aug 2016 15:34:35 +0000

Many thanks for your assistance with this - this was likely introduced due to an old client applying a change to the svn:mergeinfo property which had not received the fix to http://subversion.tigris.org/issues/show_bug.cgi?id=3896

I followed something pretty much along the lines of the process which you outlined which appears to have resoled the issue with the diffs.

Thanks once again - hope you have a good weekend.


-----Original Message-----
From: Johan Corveleyn [mailto:jcorvel_at_gmail.com]
Sent: 11 August 2016 14:47
To: Grierson, David <David.Grierson_at_sky.uk>
Cc: users_at_subversion.apache.org
Subject: Re: Blank line in historic svn:mergeinfo

First thing to try: does this problem also occur when using the
lastest svn release (1.9.4) as svn client? It's possible that more
recent svn client releases are more tolerant in this regard.

Apart from that, you're correct: because this isn't a revision
property but a *versioned* property (part of history), you can't
correct this in the repository. The only way to do this AFAIK is to
dump the repository, fix the dumpfile (using a tool like svndumptool
[1]), and load it into a new repository.

In practice, I would 'svnadmin dump OLDREPOS -r0:LASTGOODREV |
svnadmin load NEWREPOS', to do a plain dump-load (via a pipe) of
everything up until the last known good revision. Then do an
--incremental dump of the single broken revision which committed the
incorrect mergeinfo, and try to fix that single-rev dumpfile with
svndumptool (if you want, you might be able to visually verify if it's
fixed by opening the dumpfile before and after with a text editor (but
caution: do not edit by hand, there are checksums and content-lengths;
it's easy to corrupt the dumpfile)). Then load that fixed dumpfile in
NEWREPOS. Finally start another "piped dump-load" for the rest:
'svnadmin dump --incremental OLDREPOS -rNEXTREV:HEAD | svnadmin load

[1] https://github.com/jwiegley/svndumptool

Information in this email including any attachments may be privileged, confidential and is intended exclusively for the addressee. The views expressed may not be official policy, but the personal views of the originator. If you have received it in error, please notify the sender by return e-mail and delete it from your system. You should not reproduce, distribute, store, retransmit, use or disclose its contents to anyone. Please note we reserve the right to monitor all e-mail communication through our internal and external networks. SKY and the SKY marks are trademarks of Sky plc and Sky International AG and are used under licence.
Sky UK Limited (Registration No. 2906991), Sky-In-Home Service Limited (Registration No. 2067075) and Sky Subscribers Services Limited (Registration No. 2340150) are direct or indirect subsidiaries of Sky plc (Registration No. 2247735). All of the companies mentioned in this paragraph are incorporated in England and Wales and share the same registered office at Grant Way, Isleworth, Middlesex TW7 5QD.
Received on 2016-08-12 17:35:07 CEST

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