maitrihegde / tortoisesvn

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

generated merge message contains too many entries #622

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago
reported on the mailing list:
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=30740
94

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

Original issue reported on code.google.com by tortoisesvn on 6 Mar 2014 at 7:22

GoogleCodeExporter commented 9 years ago
This seems related to issue #361: instead of using the 'record only' 
notifications unconditionally, we should only use them if the merge is actually 
done with 'record only'.

Original comment by tortoisesvn on 6 Mar 2014 at 8:28

GoogleCodeExporter commented 9 years ago
This issue was closed by revision r25273.

Original comment by tortoisesvn on 7 Mar 2014 at 6:12

GoogleCodeExporter commented 9 years ago
This issue was closed by revision r25274.

Original comment by tortoisesvn on 7 Mar 2014 at 6:17

GoogleCodeExporter commented 9 years ago
I'm still experiencing this issue.

TortoiseSVN 1.8.8, Build 25755 - 64 Bit , 2014/08/10 14:44:06

Original comment by stanley....@gmail.com on 3 Dec 2014 at 7:51

GoogleCodeExporter commented 9 years ago
Fixed only in trunk ATM (1.9) according to 
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=30956
95

Download nightly at http://nightlybuilds.tortoisesvn.net/latest/x64/full/

Original comment by ndhm...@gmx.de on 1 Feb 2015 at 12:30

GoogleCodeExporter commented 9 years ago
I have the same issue with TortoiseSVN 1.8.10, Build 26129; having to build my 
own command-line script to circumvent this annoyance.

It might not seem like much, but using JIRA connector (or any bugtracker 
connector that relies on the comment content) means that merge could improperly 
flag JIRA # as being part of the merge ...

Original comment by sberthia...@gmail.com on 12 Mar 2015 at 12:55