generated merge message absent if merge button used

[Niko Paltzer]

Hi,

here is what I did:
- Commit a change to a branch successfully.
- Click on the Merge button.
- Select the trunk.
- Merge successfully.
- Start commit on the trunk.
- Select the topmost message from "Recent messages". It is the one generated by the merge starting with "Merged revision(s) ".

Here is what I expect:
The generated commit message contains the message from the branch-commit.

Here is what I get:
The generated commit message contains only the "header" that ends with a colon.

The commit message is generated properly if I do the very same merge but starting from the context menu on the trunk and selecting the revision to merge from the branch via the log.

Is this a bug or am I doing something wrong?

Thanks!

Best regards, Niko

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

To unsubscribe from this discussion, e-mail: [users-un...@tortoisesvn.tigris.org].

[Stefan Küng]

On 19.10.2016 15:15, Niko Paltzer wrote:
> Hi,
>
> here is what I did:
> - Commit a change to a branch successfully.
> - Click on the Merge button.
> - Select the trunk.
> - Merge successfully.
> - Start commit on the trunk.
> - Select the topmost message from "Recent messages". It is the one generated by the merge starting with "Merged revision(s) ".
>
> Here is what I expect:
> The generated commit message contains the message from the branch-commit.
>
> Here is what I get:
> The generated commit message contains only the "header" that ends with a colon.
>
> The commit message is generated properly if I do the very same merge but starting from the context menu on the trunk and selecting the revision to merge from the branch via the log.
>
> Is this a bug or am I doing something wrong?

the merge message is generated with the log messages that are in the log
cache. If the messages/revisions are not (yet) in the log cache or if
you have disabled the log cache then those messages will be empty.
To make sure that the messages are in the log cache, show the log first
and select the revisions to merge from there.

Stefan

--
___
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=3190521

[Niko Paltzer]

> the merge message is generated with the log messages that are in the log
> cache. If the messages/revisions are not (yet) in the log cache or if
> you have disabled the log cache then those messages will be empty.
> To make sure that the messages are in the log cache, show the log first
> and select the revisions to merge from there.

Thanks for the info!

Wouldn't it be nice to put the messages in the log cache automatically (only if the cache is enabled of course)?

That would provide a more consistent behaviour.

Best, Niko

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

[Sinus Pi]

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

[Stefan Hett]

A related use case where a colleague of mine ran into:

Assume log caching is disabled and you perform a cherry pick merge which
you want to commit via the log dialog. In this case (as explained above
by StefanK) the generated log message is empty as well. If it was to be
generated from the data used on the log dialog, it'd still work in this
case (even in cases where the log cache is disabled).

Note that the log cache was disabled in this particular scenario, since
we used a process involving editing log messages. Since the log cache
doesn't pick these changes up, the colleague disabled the log cache for
that period.

--
Regards,
Stefan Hett, Developer/Administrator