On 08.06.2012 08:02, Andreas Tscharner wrote:
> Hello World,
>
> I am not on the list, so please CC me.
>
> We use Subversion as our source control system and started working with "feature branches" as described in the svn book. The SVN client is TortoiseSVN 1.7.x
>
> We have now finished a feature. We merge the trunk one last time into the feature branch and then tried to "reintegrate merge" the feature branch into trunk. But we've got the following message (see Screenshot-1.png):
>
> Error Reintegrate can only be used if revisions 21280 through 21395 were previously
> Error merged from http://srv2.metromec.local:8080/snv/QUARTIS/trunk to the
> Error reintegrate source, but this is not the case:
> Error features/US1253
> Error Missing ranges: /trunk: 21284,21297,21306,21316,21353,21357
>
> But if we look at the log ("TSVN Show Log...", "Show Merged revisions"), these changesets are clearly in the branch (they have been merged from another branch (release branch) into trunk, and from trunk into this specific feature branch).
>
> Well, we try to merge them again in the feature branch, but as expected: nothing happens (see Screenshot-2), but the problem persists.
Right-click on the feature branch, choose "merge".
Then in the merge wizard, choose "merge a range of revisions", click
"next". As the "url to merge from", enter the url of your trunk.
Then click the "Show log" button.
Now, the log dialog will show you all the log entries from trunk, with
the ones already merged to the feature branch in gray.
I suspect that the "missing ranges" of revisions that are mentioned in
your merge error message are not shown in gray.
My best guess is that someone removed the svn:mergeinfo properties that
a merge sets on your working copy before the merged changes were committed.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2970019
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-06-09 15:49:38 CEST