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

Merge bug

From: Sterling Smart <sterlingsmart_at_gmail.com>
Date: Tue, 18 Jun 2013 12:10:51 -0700

What I did:
Create branch B from trunk or some other branch (I'll refer to the base
branch as branch A)
Make some commits to branch B, including comments
Make some commits to branch A, including comments
Merge changes from A to B (using the "range of revisions" option)
Click the "Recent messages" button when committing the merge to branch B
and choose the first message in the list (this is auto-generated by the
merge)

What I wanted to happen:
The auto-generated message from the merge should NOT include the commit
comments from the changes I made to branch B (i.e., those commits that were
not merged in from branch A)

What happens:
The auto-generated message includes the commit messages from branch A (the
commits that were merged) AND the commit messages for branch B

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-06-18 21:11:49 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.