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

Automatic merge message absent if log not shown

From: Gavin Lambert <colnet_at_mirality.co.nz>
Date: Thu, 7 May 2015 23:11:57 -0700 (PDT)

I noticed this in TSVN 1.8.7; not sure if it's been fixed in a later build already but it's something that I'm unlikely to try again for a while so I thought I'd let you know about it just in case.

If I do a TSVN Merge and enter a range of revisions to merge, without ever clicking the Log button, then the automatic merge message generated for the commit dialog only includes the revision range, not the text of the commit messages.

I assume the issue is that the TSVN log cache does not yet contain the information about the merged commits at the time the message is generated; although I didn't test this and it's possible that the cache is irrelevant and the issue happens simply because Show Log wasn't used within the merge window itself.

(For the curious, the commits in question were created on the same computer but using a separate TortoiseGit checkout, and of course they were on a different branch from the active branch of the TSVN working copy. I assume this is why TSVN hadn't cached them through some other means.)

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-05-08 08:12:06 CEST

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