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

Re: "Already merged" checkmark missing, "Recent messages" commit messages obscured when committing merge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 28 Nov 2015 09:25:06 +0100

On 27.11.2015 12:24, Simon Shine wrote:
> Hi there
>
> Running TortoiseSVN 1.9.2, Build 26806 - 64 Bit on Windows 7.
>
> Since a short while ago, I have experienced these two misbehaviours:
>
> 1) After merging, the "already merged" checkmark does not appear. I
> believe the file containing meta-information about what revision
> ranges that are already merged is no longer updated. (Updating this
> was a part of the merge before, as far as I remember.)
>
> How can I make TortoiseSVN resume updating this revision range of
> merged revisions? I am not sure exactly where it is located or why it
> stopped updating. (Either because of a version update of TortoiseSVN,
> or because I checked out the branch to which I merge with a different
> base directory - I've tried checking out both /svn/MyProject,
> /svn/MyProject/branches and /svn/MyProject/branches/ActualBranch to no
> effect.)
>
> TortoiseSVN-bug1.png is attached, or see: http://i.imgur.com/aFLFzRl.png

There is no "already merged" checkbox anywhere in TSVN.
If you refer to the checkbox "Hide non-mergeable revisions": that
checkbox is shown only if there are already merged revisions available.
 From the screenshot I can see that there are such revisions available
(those shown in gray), so that checkbox should be visible.
If it's not, go to the settings dialog, saved data, and then clear the
"Dialog sizes and positions".

> 2) When committing a merge, the suggested commit messages when
> clicking "Recent messages" contains weird contractions with missing
> characters and single lines. E.g. "lipes/trunk" instead of
> "Alipes/trunk", and no message body.
>
> How can I make TortoiseSVN recommend commit messages with informative
> merge information, like it used to? I am also not sure exactly why
> this started happening.
>
> TortoiseSVN-bug2.png is attached, or see: http://i.imgur.com/sBCHpHv.png

The log messages that are generated from merges can be configured via
tsvn:mergelogtemplate properties.
If you haven't configured those, then maybe the log cache is corrupt.
Clear the log cache from the settings dialog.

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=3148451
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-11-28 09:25:12 CET

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