Re: Merge includes all branches of messages

On 25.07.2014 18:11, Richard Hessinger wrote:
> This issue is similar to issue #622 <https://code.google.com/p/tortoisesvn/issues/detail?id=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 sayrevision 14 <https://code.google.com/p/tortoisesvn/source/detail?r=14> and 15)
> 2. Commit changes to b1 (we'll sayrevision 16 <https://code.google.com/p/tortoisesvn/source/detail?r=16>)
> 3. Commit changes to b2 (we'll sayrevision 17 <https://code.google.com/p/tortoisesvn/source/detail?r=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.

https://code.google.com/p/tortoisesvn/source/detail?r=25518

-- 
        ___
   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=3085777
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].