subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Philip Martin <philip.mar...@wandisco.com>
Subject Re: SVN 1.8 merge (branch reuse) seems broken when having local mergeinfo
Date Thu, 20 Mar 2014 17:04:00 GMT
I've written a regression test and raised

 http://subversion.tigris.org/issues/show_bug.cgi?id=4481

Tim van Halteren <t.van.halteren@inforay.nl> writes:

> I'm not sure what to do next. Should I report this as a bug?
>
>
>
> On 3/13/2014 9:29 PM, Philip Martin wrote:
>> Tim van Halteren <t.van.halteren@inforay.nl> writes:
>>
>>> No replies? Is this a bug or user error? Do I need to file a bug?
>>> Could I have done something differently  to increase the chance of a response?
>> I can reproduce it with trunk.  This is my Unix version of your script:
>>
>> #!/bin/sh
>>
>> rm -rf repo wc
>> svnadmin create repo --compatible-version 1.8
>> url=file://`pwd`/repo
>> svn mkdir -mm $url/trunk
>> svn co $url/trunk wc
>> echo t >> wc/f1
>> echo t >> wc/f2
>> svn add wc/f?
>> svn ci -mm wc
>> svn cp -mm $url/trunk ^/fb1
>> svn sw ^/fb1 wc
>> echo fb1 >> wc/f1
>> echo fb1 >> wc/f2
>> svn ci -mm wc
>> svn sw ^/trunk wc
>> svn merge ^/fb1/f1 wc/f1
>> svn merge ^/fb1/f2 wc/f2
>> svn ci -mm wc
>> svn rm -mm $url/fb1
>> svn cp -mm $url/trunk ^/fb2
>> svn sw ^/trunk wc
>> echo t >> wc/f1
>> svn ci -mm wc
>> svn sw ^/fb2 wc
>> svn merge ^/trunk wc    # problem merge?
>> svn ci -mm wc
>> svn sw ^/trunk wc
>> svn merge ^/fb2 wc
>> svn ci -mm wc
>> svn sw ^/fb2 wc
>>
>> The command:
>>
>>    $ svn merge ^/trunk wc
>>
>> gives the error:
>>
>>    svn: E195016: Reintegrate can only be used if revisions 7 through 10 were previously
merged from file:///home/pm/sw/subversion/obj/repo/fb2 to the reintegrate source, but this
is not the case:
>>      trunk/f1
>>        Missing ranges: /trunk/f1:8
>>
>> Look at the earlier merge from trunk to fb2:
>>
>>    $ svn merge ^/trunk wc
>>    --- Merging r7 through r8 into 'wc':
>>    U    wc/f1
>>    --- Recording mergeinfo for merge of r7 through r8 into 'wc':
>>     U   wc
>>    --- Recording mergeinfo for merge of r7 through r8 into 'wc/f1':
>>     U   wc/f1
>>
>> That merge doesn't change wc/f2 and so the subtree mergeinfo there is
>> not modified.  As I recall that was a deliberate change several years
>> ago but I'm not sure exactly how it is supposed to interact with the
>> rest of the merge code.
>>
>

-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*

Mime
View raw message