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

Unable to cause a conflict in branch merge test

From: Bicking, David (HHoldings, IT) <David.Bicking_at_thehartford.com>
Date: 2007-09-11 17:45:13 CEST

Hello again!

I am having a problem with what I thought was a very simple test. I am
attempting to merge a specific file in a branch into the trunk, which
also has that file. I changed both files such that at one place there
should be conflicting changes, and at another there are non-conflicting
changes. I simply modified some text which ended up similar to :

// test
// This is a test file change made in the Foo.BAR branch
// test.

The branch has the highest revision number. Whenever I merge, it acts
as though I am overriding the trunk with the branch. The operation has
From = trunk, To = branch and is putting the modified file in the Trunk
workspace. I expected all modified lines in the new file, with a
conflict on the line that had two different texts. I attached a graphic
in a Word 2003 file that shows the diff result on the two files. The
one on the right is the branch, and the ultimate output.

I merged at the head of each codeline. When I reverse the from/to, the
included image is reversed and the trunk overrides the branch. The
branch occurred at r47, the trunk is at r52, and the branch is at r53.

Clearly, I'm doing something wrong. I'm using Tortoise to do the merge,
hopefully that isn't enough reason for you all to tell me to go to their
users group.

This communication, including attachments, is
for the exclusive use of addressee and may contain proprietary,
confidential and/or privileged information.  If you are not the intended
recipient, any use, copying, disclosure, dissemination or distribution is
strictly prohibited.  If you are not the intended recipient, please notify
the sender immediately by return e-mail, delete this communication and
destroy all copies.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Received on Tue Sep 11 17:42:10 2007

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

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