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

Re: Bug when merging with dry-run switch?

From: Paul Burba <ptburba_at_gmail.com>
Date: Thu, 11 Dec 2008 11:09:42 -0500

On Wed, Nov 26, 2008 at 12:04 PM, Paul Burba <ptburba_at_gmail.com> wrote:
> On Wed, Nov 26, 2008 at 2:17 AM, Michael Susser <hdmlist_at_googlemail.com> wrote:
>> 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
>> »D:\wc\p09A\Tp\Spc\Tp\TestCenter\Src\CoatingUnitTest«:
>> 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
>> d:\svnserver\src-tags-1.5.4\subversion\libsvn_wc\lock.c:1433:
>> (apr_err=155005)
>> svn: Keine Schreibsperre in
>> »D:\wc\p09A\Tp\Spc\Tp\TestCenter\Src\CoatingUnitTest«
>>
>> ("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.

Michael,

Just an fyi: I suspect this bug was difficult to reproduce because it
will only occur *if*
'D:\wc\p09A\Tp\Spc\Tp\TestCenter\Src\CoatingUnitTest' has locally
*added* mergeinfo -- hence the notification in your report of ' G'
rather than ' U'.

I adjusted a merge test in r34669 to demonstrate this problem.

Paul

<SNIP>

>> Can anyone confirm that this is a bug or not, please?
>
> Hi Michael,
>
> It is indeed a bug and your patch is basically the right approach.
> But we can go a bit further and not bother creating/populating the
> paths_with_new_mergeinfo hash during a dry-run and also make the
> entirety of process_children_with_new_mergeinfo a no-op for dry-runs.
> That should solve your bug and eliminate some unnecessary work during
> dry-runs.
>
> Committed this change in r34432 and will nominate it for backport to 1.5.x.
>
> Paul
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=982909
Received on 2008-12-11 17:19:25 CET

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