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

Bug when merging with dry-run switch?

From: Michael Susser <hdmlist_at_googlemail.com>
Date: Wed, 26 Nov 2008 08:17:21 +0100

Hello community,

i think i have found a small bug regarding dry-run-merge in svn versions >
1.5.3. The error message i get is the following:

svn merge --accept postpone --dry-run -c43053
http://vmprjsrv02/svn/APPL/SCU/SPC/branches/b09A D:/wc/p09A/Tp/Spc
-- Zusammenführen von r43053 in
U D:\wc\p09A\Tp\Spc\Tp\TestCenter\Src\CoatingUnitTest\Id_18519.tsd
U D:\wc\p09A\Tp\Spc\Tp\TestCenter\Src\CoatingUnitTest\Id_18520.tsd
U D:\wc\p09A\Tp\Spc\Tp\TestCenter\Src\CoatingUnitTest\Id_18521.tsd
U D:\wc\p09A\Tp\Spc\Tp\TestCenter\Src\CoatingUnitTest\Id_18525.tsd
 G D:\wc\p09A\Tp\Spc\Tp\TestCenter\Src\CoatingUnitTest
svn: Keine Schreibsperre in

("Keine Schreibsperre" means "No write-lock")

I tried to create a recipe to reproduce this message but did not succeed.
Maybe the history of my working copy is too complex. The bug does not occur
in svn versions 1.5.0-1.5.3.

Then i debugged a little bit and found the reason for the error in
libsvn_client/merge.c in the new function
"process_children_with_new_mergeinfo" (which was introduced in 1.5.4). Here
is a patch that worked for me, but i do not know what side effects it has:

Index: merge.c
--- merge.c (revision 34373)
+++ merge.c (working copy)
@@ -5144,9 +5144,12 @@
- adm_access,
+ if (!merge_b->dry_run)
+ {
+ adm_access,
+ }

               /* If the path is not in NOTIFY_B->CHILDREN_WITH_MERGEINFO

Can anyone confirm that this is a bug or not, please?

Michael Susser
Received on 2008-11-26 08:17:36 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.