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

Re: [Issue 3957] New - reintegrate fails with no subtree mergeinfo on source

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Wed, 13 Jul 2011 19:15:58 +0300

philip_at_tigris.org wrote on Wed, Jul 13, 2011 at 08:49:18 -0700:
> http://subversion.tigris.org/issues/show_bug.cgi?id=3957
> Issue #|3957
> Summary|reintegrate fails with no subtree mergeinfo on source
> Component|subversion
> Version|1.6.x
> Platform|All
> URL|
> OS/Version|All
> Status|NEW
> Status whiteboard|
> Keywords|
> Resolution|
> Issue type|DEFECT
> Priority|P3
> Subcomponent|libsvn_client
> Assigned to|issues_at_subversion
> Reported by|philip
>
>
>
>
>
>
> ------- Additional comments from philip_at_tigris.org Wed Jul 13 08:49:17 -0700 2011 -------
> reintegrate fails in 1.6.x from 1.6.13 on, when the target has explicit subtree
> mergeinfo and the source does not. The following script shows the problem (I'll
> attach it as well). The final reintegrate merge works with 1.6.12 and 1.7 but
> fails with 1.6.13 on. The error is:
>
> svn: Reintegrate can only be used if revisions 4 through 11 were previously
> merged from file:///home/pm/sw/subversion/obj/repo/A to the reintegrate source,
> but this is not the case:
> Y/B
> Missing ranges: /A/B:4-10
>
> However the mergeinfo for Y is /A:4-10 and Y/B has no mergeinfo to override it.
>
> The problem can be worked around by doing a --dry-run merge on the source subdir.
>

Isn't that a bug in itself (that --dry-run causes some subsequent 'svn'
operation to behave differently)? Or did you mean --record-only?

>
>
>
> #!/bin/sh -e
>
> svn=svn ; svnadmin=svnadmin ; svnlook=svnlook ; svnmucc=svnmucc
> repo=repo ; wc=wc ; url=file:///`pwd`/$repo
> rm -rf $repo $wc
> $svnadmin create $repo
>
> $svn mkdir -mm $url/A
> $svn mkdir -mm $url/A/B
> $svnmucc -mm -- put - $url/A/B/f <<EOD
> ABf
> XBf
> YBf
> EOD
>
> $svn cp -mm $url/A $url/Y
> $svn cp -mm $url/A $url/X
>
> $svnmucc -mm -- put - $url/A/B/f <<EOD
> ABf1
> XBf
> YBf
> EOD
>
> $svnmucc -mm -- put - $url/Y/B/f <<EOD
> ABf
> XBf
> YBf1
> EOD
>
> $svnmucc -mm -- put - $url/X/B/f <<EOD
> ABf
> XBf1
> YBf
> EOD
>
> $svn co $url/X $wc
> $svn merge --accept postpone ^/A $wc
> $svn ci -mm $wc
> $svn sw $url/A $wc
> $svn merge --reintegrate ^/X/B $wc/B
> $svn ci -mm $wc
>
> $svn sw $url/Y $wc
> $svn merge --accept postpone ^/A $wc
> $svn merge -r9:4 ^/X/B wc/B
> $svn ci -mm $wc
> $svn sw $url/A $wc
> $svn merge --reintegrate ^/Y $wc
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=463&dsMessageId=2791983
>
> To unsubscribe from this discussion, e-mail: [issues-unsubscribe_at_subversion.tigris.org].
Received on 2011-07-13 18:16:48 CEST

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