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

Blank line in historic svn:mergeinfo

From: Grierson, David <David.Grierson_at_sky.uk>
Date: Wed, 10 Aug 2016 16:21:40 +0000

Hi,

Our FishEye indexing service is currently having problems with a repository which appears to be due to an invalid svn:mergeinfo property which has an empty line.

Looking at the revisions in question - I can successfully look at the regular log with no issues:

$ svn log -v -r44647:44648 http://<REPO-URL>/Database/OPR/01_BUILD/branches/DB_OPR-89.x_at_44647
------------------------------------------------------------------------
r44648 | luw07 | 2016-07-15 09:43:34 +0100 (Fri, 15 Jul 2016) | 1 line
Changed paths:
   M /Database/OPR/01_BUILD/branches/DB_OPR-89.x

CIMBT-602 clean
------------------------------------------------------------------------

But if I attempt to look at the merge history as well I get an error:

$ svn log -g -r44647:44648 http://<REPO-URL>/Database/OPR/01_BUILD/branches/DB_OPR-89.x_at_44647
svn: E200020: Pathname not terminated by ':'

Running a diff between these revisions reveals the erroneous empty line:

$ svn diff -r44647:44648 http://<REPO-URL>/Database/OPR/01_BUILD/branches/DB_OPR-89.x_at_44647
Index: .
===================================================================
--- . (revision 44647)
+++ . (revision 44648)

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
+
/Database/OPR/01_BUILD/branches/DB_OPR-11.8:25707-25711
/Database/OPR/01_BUILD/branches/DB_OPR-11.9:25760-25762
/Database/OPR/01_BUILD/branches/DB_OPR-11.x:25671-25673

This appears to have been fixed at a later revision in the repository:

$ svn diff -r44647:44662 http://<REPO-URL>/Database/OPR/01_BUILD/branches/DB_OPR-89.x_at_44647
Index: .
===================================================================
--- . (revision 44647)
+++ . (revision 44662)

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
+
/Database/OPR/01_BUILD/branches/DB_OPR-11.8:25707-25711
/Database/OPR/01_BUILD/branches/DB_OPR-11.9:25760-25762
/Database/OPR/01_BUILD/branches/DB_OPR-11.x:25671-25673
$ svn diff -r44647:44663 http://<REPO-URL>/Database/OPR/01_BUILD/branches/DB_OPR-89.x_at_44647

Is there any way I can modify the svn:mergeinfo properties on the revisions where this appears to be broken (revisions 44648 through to 44662)? When attempting to set this I get the following error:

$ svn propset svn:mergeinfo -r44648 -F save-file http://<REPO-URL>/Database/OPR/01_BUILD/branches/DB_OPR-89.x
svn: E205000: Try 'svn help propset' for more information
svn: E205000: Cannot specify revision for setting versioned property 'svn:mergeinfo'

Presumably this is because svn:mergeinfo isn't a revision property?

Does anyone have any suggestions as to how to correct this?

Thanks in advance,

David.
________________________________

--
David Grierson<https://confluence.bskyb.com/display/~DGR02/> - SDLC Tools Specialist
Sky Broadcasting - Customer Business Systems - SDLC Tools<https://confluence.bskyb.com/display/TwikiImport/>
Tel: +44 1506 325100 / Email: david.grierson_at_sky.uk<mailto:david.grierson_at_sky.uk>
Watermark Building, Alba Campus, Livingston, EH54 7HH
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-10 18:22:22 CEST

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