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

AW: Merge commit message generation bogus

From: Jojakim Stahl <joja_at_jojakim.de>
Date: Mon, 19 May 2014 08:58:20 +0200

Hello Stefan,

Thank you for taking the time to investigate the problem.
But I'm not sure that it is impossible to do anything against, because this
behavior doesn't show up always like this. I do many, many merges with
revision ranges x-y where in-between are gaps. Most of the time the commit
message is setup correctly. There must be some special circumstances where
it fails.

Note i.e., that the problem didn't show up when you started on a
"prefabricated" repository and you didn't do the commits on the same
machine.

Note also, that when you do not enter the Show Log dialog on the merge
operations, but accept the preset revision range without confirming them in
the Show Log window, the commit message which is build doesn't contain the
log text at all.

Personally, I would locate the problem somewhere in the log cache, just a
guess. I don't know the source code and so I don't know anything of
certitude at all.

---
Joja
-----Ursprüngliche Nachricht-----
Von: Stefan Küng [mailto:tortoisesvn_at_gmail.com] 
Gesendet: Freitag, 16. Mai 2014 17:31
An: users_at_tortoisesvn.tigris.org; Jojakim Stahl
Betreff: RE: Merge commit message generation bogus
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=3078708
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-05-21 16:33:20 CEST

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