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

RE: Merge commit message generation bogus

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 16 May 2014 08:31:28 -0700 (PDT)

While I can reproduce the problem with your script, there's nothing in TSVN we can do to fix it. If you look at the messages from the last merge it says:
Command : Merging revisions 4-7 of file:///SVNTests/repo/branches/b1 into D:\SVNTests\trunk, respecting ancestry
Merging r5 through r7 : D:\SVNTests\trunk
Updated : D:\SVNTests\trunk\f1.txt
Recording mergeinfo for merge of r5 through r7 : D:\SVNTests\trunk

so all we get is the range 'r5 through r7' and TSVN uses the log messages from that range to pre-fill the 'recent messages'. We don't get the info that r6 wasn't really merged.

(btw: gmail rejected that message because even though you zipped the cmd file, it still was a cmd file which gmail won't let through, so next time just send a text file - I can rename it to a cmd file myself)

Stefan

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-05-16 17:31:36 CEST

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