Automatic merge comment includes unrelated changes

Hello,

When one merges changes from a given branch into a working copy, the
"Recent messages" list conveniently gets populated with a generated
message listing where the merge occured from alongside the revisions
authors and comments associated with them.
The issue I'm facing is that this list contains comments from changes
that did not occur on the branch. Let's say for instance that I have two
branches and a trunk :

/branches/b1
/branches/b2
/trunk

b1 and b2 where created from /trunk at revision 10
b1 received two commits at revision 15 and 20
b2 received no further commits
trunk received the remaining commits (11-14, 16-19)

I'm now merging branch b1 into b2 and so only revs 15 and 20 are merged.
When I go into the "Recent messages" list in the commit dialog, I find a
generated message, but that message lists commit messages for all
revisions from 11 to 20 when I was expecting to have commit messages
only for revs 15 and 20

I'm using TortoiseSVN 1.8.5 but what I'm writing about was also
happening with TortoiseSVN 1.8.4 but did not in older versions
(definitely not in 1.7).
This issue happens in all cases, whether I specify the revisions that I
want to merge (cherry picking with intervals) or not.

I have looked in the issue tracker and could not find anything related
(I used "merge message" keywords)

Any comments are welcome.

Regards
OBones

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3074094

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-03-06 15:15:29 CET