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

Issue With Merge

From: Ira Williamson <ira_at_qqest.com>
Date: Mon, 27 Sep 2010 12:22:56 -0700 (PDT)

I am trying to merge a Branch into a Trunk

The Merge feature has been working in the past but just recently any time anyone on our team tries to merge changes from a branch into the trunk the same two files come up as needing to be merged, no matter what files have been changed in the Branch. It has been verified that files are the same between the Trunk and the Branch.

Steps we follow to merge a branch to a trunk.

We Right click on the trunk dir and select. TortoiseSVN>Merge
Select "Merge two different trees" as the Merge type.
Select "Next"
Select the branch dir and HEAD Revision for the "From: (startURL and revision of the range to merge)"
Select the trunk dir and HEAD Revision for the "To: (end URL and revision of the range to merge)"
Select "Next"
Merge depth: "Working Copy"
Ignore ancestry: "Unchecked"
Ignore line endings: "Unchecked"
Compare whitespaces: "selected"
Only record the merge: "Unchecked"
Result: No matter what files we change in the branch the same two files keep coming up to merge. We have tried countless times to merge the files hoping the would disappear but they keep coming back as needing to merge.

Any help at all would be great!

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-27 21:27:07 CEST

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