merge --record-only issues
From: <Jeroen.Devlieger_at_nikon.com>
Date: Fri, 29 Jan 2016 09:26:10 +0000
Hi,
(my apologies for the spam if this is mail got send twice)
I have observed that when a revision is merged with the --record-only option
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.
* Tortoisesvn is downloading huge amounts of data 15MB so far in the following example:
* The merging of the binaries conflict (no surprise there) at which point the merge is terminated with the message
* 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.
With kind regards,
TortoiseSVN 1.9.2, Build 26806 - 64 Bit , 2015/09/22 18:33:30
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
|
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.