[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Re: generated merge message absent if merge button used

From: Sinus Pi <sinus-tigris_at_sinpi.net>
Date: Tue, 11 Apr 2017 11:40:38 -0700 (PDT)

I'm afraid this doesn't help at all. In an Auto-Merge, the log message is NOT generated.

My Log Caching is on (timeout 5, days of inactivity 10, max size 200, tool failures 5).

I open the Merge dialog, I pick a branch, I click "select revision range", I hit CTRL+A to select all the revisions listed, a combined log of all the 100 revisions selected is shown. I assume it has been cached by now.

I close the selection dialog, as I don't want to cherry-pick, I want an auto-merge. I return to the main Merge dialog, I switch to "all revisions". "Next", "Merge". The merge runs and merges two or three recent revisions from the other branch.

I now go to Commit... and the message says "MERGED revs from branches/ZGV-newcontent:" (my mergelogtemplatetitle is set to "== MERGED revs {revrange} from {mergeurl}:"). And that's it.

TSVN surely had all the needed revisions' log entries cached. Or, barring that, surely it knew what revisions were actually merged in, so that at least the revrange could be filled in.

Sadly, this forces me to cherrypick to get the log message done right, and then to run an auto-merge again, only to be sure nothing got left behind, and to have the mergeinfo flattened.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-04-11 20:41:15 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.