Problems with "merge reintegrate": possible bug?
From: Andreas Tscharner <Andreas.Tscharner_at_metromec.ch>
Date: Fri, 8 Jun 2012 06:02:37 +0000
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
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.
Server: SVN Server 1.7.4 (Visual SVN 2.5.4), 64 Bit, Windows Server 2008 R2, 64Bit
Is this a known problem? Shall I file a bug report?
Thanks and best regards
-- Andreas Tscharner, Development Wenzel Metromec AG, Rheinfelsstrasse 1, CH-7007 Chur, Switzerland phone: +41 (0)81 257 07 00 fax: +41 (0)81 257 07 01 e-mail: mailto:andreas.tscharner_at_metromec.ch www: http://www.metromec.ch ------------------------------------------------------ http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2969697 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
|
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.