Hi,
You performed a depth limited merge. and then performed the same merge.
But to record a depth limited merge we might have to change mergeinfo on
other nodes in some cases, because we can't record all kinds of changes in
the mergeinfo on the node itself.
As far as I know the dry-run only tries to apply the actual merge (not the
mergeinfo), and looking at your output that doesn't change by the merge.
Given all this, I would recommend checking with Subversion 1.8.x if you want
to have better merge conflict detection.
We improved the merge logic more than a bit in 1.8 and I don't see how this
can/would ever be backported to the 1.7.x maintenance version. (And even
there we are at 1.7.14 now; and 1.7.15 soon)
Bert
From: Vesa Paatero [mailto:vesapaat...@yahoo.com]
Sent: dinsdag 11 februari 2014 11:11
To: users@subversion.apache.org
Subject: --dry-run seems to fail with a merging command
Hi everyone. When I ran
uuuuuuuuuuuu>svn merge --dry-run --allow-mixed-revisions --depth empty
"^/app/trunk/uuuuuuuuuuuu/scripts_deprecated_tests_etc"
scripts_deprecated_tests_etc
I got no output. However, when I ran
uuuuuuuuuuuu>svn merge --allow-mixed-revisions --depth empty
"^/app/trunk/uuuuuuuuuuuu/scripts_deprecated_tests_etc"
scripts_deprecated_tests_etc
I got the following output:
--- Recording mergeinfo for merge of r1139 through r4181 into
'scripts_deprecate
d_tests_etc':
G scripts_deprecated_tests_etc
(The "uuuuuuuuuuuu" represents a directory name of the same length that was
replaced for privacy.)
So, the output was changed (i.e. omitted) by the "--dry-run" switch. Does
that behavior indicate a bug? This was run in the command prompt of Windows
XP. The beginning of the version output of my svn is as follows:
svn, version 1.7.6 (r1370777)
compiled Aug 14 2012, 18:46:39
Copyright (C) 2012 The Apache Software Foundation.
Thanks for considering this.
