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

question about *.merge-right.r*

From: Abrahm Scully <abrahm.scully_at_gmail.com>
Date: Wed, 1 Dec 2010 15:11:35 -0500

I have a branch of trunk that I'm doing some work it. Someone
committed changes to ^/trunk that I wanted, so I ran "svn merge
^/trunk" in a wc of my branch.

One of the files had a conflict, and I postponed resolution. I opened
the myfile.merge-left.r* and found the old version of the file. I
opened myfile.working and found what is currently in my branch.

But when I opened myfile.merge-right.r*, the contents didn't match any
version of the file I can find. None of the myfile.* files match what
is in ^/trunk. I thought the myfile.merge-right.* file was supposed to
be a copy of the file from ^/trunk.

Can someone help me understand this? What gets put in the merge-right file?

Received on 2010-12-01 21:15:05 CET

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.