Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (athena.apache.org: domain of cdhaakin@us.ibm.com
 designates 32.97.182.139 as permitted sender)
Subject: Help with files changed outside of svn
To: users@subversion.apache.org
Message-ID: 
 <OF06A1BA8C.69FE8BE7-ON87257845.0056C5A1-85257845.00576961@us.ibm.com>
From: Christopher D Haakinson <cdhaakin@us.ibm.com>
Date: Mon, 28 Feb 2011 10:54:46 -0500
MIME-Version: 1.0
Content-type: multipart/alternative;
	Boundary="0__=08BBF2D6DFC543318f9e8a93df938690918c08BBF2D6DFC54331"
Content-Disposition: inline

--0__=08BBF2D6DFC543318f9e8a93df938690918c08BBF2D6DFC54331
Content-type: text/plain; charset=US-ASCII


I'm fairly new to svn, and I have things set up and running well.

I wanted to test out a scenario where a file controlled by svn gets changed
outside of svn inside the working copy, and now I'm lost and can't find
much help on what to do.

Here's my example:  I setup the hooks folder as a svn project. Checked it
out onto my windows box and made a small change, then committed the
changes.
Now I went through my command shell and manually changed a file outside of
svn.
Then I went back to my windows box and editted the same file with a
different change.
Now the original file contains:  ">>>>>>> .r3" at the bottom

Also I have some more files inside my working directory too:

 pre-revprop-change.tmpl
 pre-revprop-change.tmpl.mine
 pre-revprop-change.tmpl.r2
 pre-revprop-change.tmpl.r3


Can someone please explain to me:

1) Why does >>>>>>> get put into the bottom of my files?
2) What are the 3 copies of this file for?

3) And now how do I get these files merged back into one copy with the
changes made inside svn included and the changes made outside svn excluded?
--0__=08BBF2D6DFC543318f9e8a93df938690918c08BBF2D6DFC54331
Content-type: text/html; charset=US-ASCII
Content-Disposition: inline

<html><body>
<p>I'm fairly new to svn, and I have things set up and running well. <br>
<br>
I wanted to test out a scenario where a file controlled by svn gets changed outside of svn inside the working copy, and now I'm lost and can't find much help on what to do.<br>
<br>
Here's my example:  I setup the hooks folder as a svn project. Checked it out onto my windows box and made a small change, then committed the changes.<br>
Now I went through my command shell and manually changed a file outside of svn.<br>
Then I went back to my windows box and editted the same file with a different change.<br>
Now the original file contains:  &quot;&gt;&gt;&gt;&gt;&gt;&gt;&gt; .r3&quot; at the bottom<br>
<br>
Also I have some more files inside my working directory too:<br>
<br>
 pre-revprop-change.tmpl<br>
 pre-revprop-change.tmpl.mine<br>
 pre-revprop-change.tmpl.r2<br>
 pre-revprop-change.tmpl.r3<br>
<br>
<br>
Can someone please explain to me:<br>
<br>
1) Why does &gt;&gt;&gt;&gt;&gt;&gt;&gt; get put into the bottom of my files?<br>
2) What are the 3 copies of this file for?<br>
<br>
3) And now how do I get these files merged back into one copy with the changes made inside svn included and the changes made outside svn excluded?</body></html>
--0__=08BBF2D6DFC543318f9e8a93df938690918c08BBF2D6DFC54331--