[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: Jojakim Stahl <joja.public_at_jojakim.de>
Date: Mon, 28 Apr 2014 04:56:18 -0700 (PDT)

I created a test case which shows this behavior.

Attached you find the repository.

Check out trunk
Try to merge Revision 4-6 from b1 to trunk
The generated log message has a line from r5 in b2 in it.

Note, when tried to do the merge 4-6 after commit of r6, the error didn't Show up. I needed to do some other merges from b1->b2->b1 etc.

--
Joja
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3077166
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

  • application/octet-stream attachment: repo.7z
Received on 2014-04-28 13:56:22 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.