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

Re: Merge Log text for single revision should look the same as for multiple revisions

From: Jean-Marc van Leerdam <j.m.van.leerdam_at_gmail.com>
Date: Sun, 27 Nov 2011 21:29:54 +0100

Stefan,

Never mind. See below...

On 27 November 2011 21:11, Jean-Marc van Leerdam
<j.m.van.leerdam_at_gmail.com>wrote:

> Stefan,
>
> On 23 November 2011 22:54, Stefan K√ľng <tortoisesvn_at_gmail.com> wrote:
>
>> On 23.11.2011 22:51, Jean-Marc van Leerdam wrote:
>> > Hi,
>> >
>> > On 8 November 2011 22:21, Jean-Marc van Leerdam
>> > <j.m.van.leerdam_at_gmail.com <mailto:j.m.van.leerdam_at_gmail.com>> wrote:
>> >
>> > Hi,
>> >
>> > When merging multiple revisions, the 'show log' dialog conveniently
>> > lists the revision comments of the selected revisions including the
>> > revision numbers. However, when selecting just one revision, the
>> > revision number is omitted. Can this be changed to show the comments
>> > in a consistent way?
>> >
>> > I am used to copying these comments into the commit dialog when
>> > committing the merge, prepending it with a 'Merge revisions from
>> > trunk:' text. For single revision merges I have to remember the
>> > revision number (or open a separate show log).
>> >
>> > Another thing I noticed: the comments from the selected revisions
>> > are shown in reverse order. This does not make sense to me, I expect
>> > the comments to be shown chronologically ascending (old on top). I
>> > know this is different from the list of revisions in the top pane,
>> > but after a copy/paste into the commit dialog it just looks strange.
>> >
>> >
>> > I have not seen any responses to this mail. Does that mean the
>> > suggestions are not useful?
>>
>> It's a good suggestion. But I don't like the idea of adding the rev
>> number to the log message if only one is shown. It makes sense when
>> multiple revs are selected. But not for just one: in that case it would
>> confuse users so they think that the rev is part of the log message.
>>
>> Do you have a suggestion on how to overcome this?
>>
>> Not something that will work for all occasions at the same time.
>
> The only way I see is to add one or two additional strings next to the
> MergeLogSeparator to the Advanced settings page:
> MergeLogOrderAscending (true/false)
> MergeLogTemplateSingle (string pattern)
> MergeLogTemplateMulti (string pattern)
>
> The string patterns use %rev% and %msg% as the placeholders for the
> revision number and original log message.
>
> Anyway, I realize this may be quite some work, and without any supporting
> 'me too' responses probably not worth the effort. Introducing a user
> customizable pattern that drives the replacement code has quite some risk I
> guess.
>

I now see that the 'recent messages' list is populated after a merge is
done. This contains exactly what I need and in the order I expect.

There is a difference in the way the log messages are shown in the merge
dialog (when selecting the revisions to merge) and the 'recent messages'
entry that is created, but I can certainly live with that.

Sorry to have bothered you with this. Keep up the great work!

-- 
Regards,
Jean-Marc
--
.       ___
.  @@  // \\      "De Chelonian Mobile"
. (_,\/ \_/ \     TortoiseSVN
.   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
.   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2888175
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-11-27 21:30:04 CET

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