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

merge --record-only issues

From: <Jeroen.Devlieger_at_nikon.com>
Date: Fri, 29 Jan 2016 09:12:42 +0000

Hi,

I have observed that when a revision is merged with the --record-only option
[cid:image004.jpg_at_01D15A7D.91ED60C0]

Then subversion seems to still be downloading the revision delta, while I expected it to only update the svn:mergeinfo property.

This becomes very apparent when trying to mark a large set of revisions, revisions that update some not so small binary files , as merged.
While I expect this to be done quite fast and without any need for manual intervention I have observed the following:

* Tortoisesvn is downloading huge amounts of data 15MB so far in the following example:
[cid:image005.jpg_at_01D15A7D.91ED60C0]

* The merging of the binaries conflict (no surprise there) at which point the merge is terminated with the message
[cid:image006.jpg_at_01D15A7D.91ED60C0]
Even though I checked the 'Force merge' and the status of the 'merge non-interactive' checkbox also has no impact on this.

* Lastly I noticed that the svn:mergeinfo property is not only updated for the relevant paths, as is done during a 'normal' merge. But instead it is updated for a lot of folders. Even the ones that are not changed in those revisions. Why is that? I find it surprising and weird that lots that unrelated folders have updated mergeinfo when I just mark a single revisions which changes a single as merged using this '-record-only' option. Can someone explain why this is?

I'm tempted to just manually update the svn:mergeinfo property on the root of my project excluding, which would easily achieve what I want to do.
Is there any reason why I should not do such a thing? (I know, the svn documentation explicitly, strongly and multiple times warns against manually modifying the svn:mergeinfo property as the result is highly likely to be incorrent and/or incomplete)

With kind regards,
Jeroen

TortoiseSVN 1.9.2, Build 26806 - 64 Bit , 2015/09/22 18:33:30
Subversion 1.9.2, -release
apr 1.5.2
apr-util 1.5.4
serf 1.3.8
OpenSSL 1.0.2d 9 Jul 2015
zlib 1.2.8
SQLite 3.8.11.1

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3157554

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

image004.jpg
image005.jpg
image006.jpg
Received on 2016-01-29 10:22:45 CET

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