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

Re: Merging from branch to trunk.

From: adam35413 <adam.hammer_at_gmail.com>
Date: Wed, 19 May 2010 10:26:11 -0700 (PDT)

I went ahead with the merge, and the same issue was there; two tree
conflicts. When I went to one of the conflicts and did Edit Tree Conflicts,
I saw the following:

The last merge operation tried to add the file 'Foo.txt', but it was already
added locally.
Source Left: http://server.local:8080/svn/Main@30
Source Right: http://server.local:8080/svn/Main@48

I have tried keeping the file from the repository and the local file on the
many merges I have attempted, and nothing works. Interesting thing: The
Source Left version number (30) has not changed through out the entire
process; it has always been 30.

Any other ideas?

Stefan Küng wrote:
> On 19.05.2010 18:48, adam35413 wrote:
>> I went to the trunk and looked at the Check-For-Modification option.
>> There
>> were the two errors I saw in the merge so I fixed those. However, when I
>> went to try to merge again, the same exact errors are appearing when I do
>> "Test Merge." I checked for modifications in the trunk again, and there
>> are
>> none.
> A 'test merge' doesn't modify the working copy, only a real merge does.
> And also a test merge shows more conflicts because it doesn't execute
> the merge but only guesses what the outcome of the merge would be.
> Stefan
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2610915
> To unsubscribe from this discussion, e-mail:
> [users-unsubscribe_at_tortoisesvn.tigris.org].

View this message in context: http://old.nabble.com/Merging-from-branch-to-trunk.-tp28609693p28611505.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-05-19 19:42:27 CEST

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