search

kruemelhase / tortoisesvn

Automatically exported from code.google.com/p/tortoisesvn
0 stars 0 forks source link

Merge includes all branches of messages #656

Closed GoogleCodeExporter closed 8 years ago

GoogleCodeExporter commented 8 years ago 
This issue is similar to issue #622.  I'm running TSVN 1.8.7.  Given the 
following repo's:

repo/b1
repo/b2

When merging b2 into b1 and selecting the revisions from the show log button, 
the revisions are merged correctly but the message shows messages from both b1 
and b2.  The issue is not necessarily a problem with how its grabbing the 
messages, its more the revisions it puts into the merge.  Here is how to 
recreate the issue.

What steps will reproduce the problem?
1.  Commit changes to b2 (we'll say revision 14 and 15)
2.  Commit changes to b1 (we'll say revision 16)
3.  Commit changes to b2 (we'll say revision 17)
4.  Select b1 and click merge
5.  In the merge dialog, select show log on b2
6.  Select revisions 14, 15, and 17 (note that the merge wizard will put in 
revisions 14-17)
7.  Continue the merge process
8.  Commit b1 and select the recent messages and select the merge message.

What is the expected output? What do you see instead?
I expect to only see comments from 14, 15, and 17.  It includes comments from 
14, 15, 16 (from b1), and 17.  If I change the merge revisions to be 14-15, 17 
the message is correct.

What version of TortoiseSVN are you using?
1.8.7

What Windows version are you using?
Win 7 Pro x64

Please provide any additional information below.
 If I change the merge revisions to be 14-15, 17 the message is correct.

Original issue reported on code.google.com by RHessinger on 25 Jul 2014 at 2:37

GoogleCodeExporter commented 8 years ago 
For the reasons described on the issue tracker main page
(http://code.google.com/p/tortoisesvn/wiki/IssueTracker?tm=3)
please do not file issues without being told to do so by
one of the developers on our mailing list users@tortoisesvn.tigris.org or use
the forum for the mailing list here:
http://tortoisesvn.tigris.org/ds/viewForumSummary.do?dsForumId=4061

In accordance with our guidelines I'm closing this issue as NotDiscussed.
Please post your questions to the users@ mailing list before filing an issue.
If one of the developers on the mailing list agrees that your issue is valid,
we will reopen this issue.

Original comment by tortoisesvn on 25 Jul 2014 at 4:07