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

Re: AW: Merge commit message generation bogus

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 23 May 2014 19:11:18 +0200

On 23.05.2014 11:48, Jojakim Stahl wrote:
>> While I can reproduce the problem with your script, there's nothing in TSVN
> we can do to fix it.
>
> Hello Stefan and others,
>
> I created a patch which resolves the problem I encountered.
> As I'm not a regular TSVN developer, I'm not sure to have it right in all
> details, especially cache and path handling, but it should give the idea
> what to do.
>
> The patch checks, if the candidate revision for the merge message generation
> contains modifications in a sub-path of the merge source url.

Looks good, but it won't work for all situations. I admit it's much
better than now though.
One edge case: there are revisions that don't touch any paths like this one:
https://code.google.com/p/tortoisesvn/source/detail?r=4868
but I guess that's one situation where it's ok to not use the message
(this rev doesn't have a commit message, but it could have).

> Another question, perhaps already asked: Is there a reason why only cached
> revisions are considered to build up the merge message? Would it be possible
> to update the cache to be sure to have all messages of the revisions that
> have been merged?

Yes, we could fetch the log. But we don't because fetching the log is
expensive, i.e. takes quite a while. And not all users have fast
connections or even a fast server.

Maybe I could add an option to enable fetching the log, but having such
a feature active unconditionally is too dangerous - people can get
really, really angry if they have to wait.

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=3079039
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-05-23 19:11:18 CEST

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