From users-return-7904-apmail-subversion-users-archive=subversion.apache.org@subversion.apache.org Mon Feb 28 16:15:24 2011 Return-Path: Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: (qmail 78288 invoked from network); 28 Feb 2011 16:15:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Feb 2011 16:15:24 -0000 Received: (qmail 96384 invoked by uid 500); 28 Feb 2011 16:15:23 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 96203 invoked by uid 500); 28 Feb 2011 16:15:21 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 96185 invoked by uid 99); 28 Feb 2011 16:15:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Feb 2011 16:15:20 +0000 X-ASF-Spam-Status: No, hits=-0.1 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_MED,SPF_PASS,TVD_FW_GRAPHIC_NAME_MID X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of cdhaakin@us.ibm.com designates 32.97.182.144 as permitted sender) Received: from [32.97.182.144] (HELO e4.ny.us.ibm.com) (32.97.182.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Feb 2011 16:15:10 +0000 Received: from d01dlp02.pok.ibm.com (d01dlp02.pok.ibm.com [9.56.224.85]) by e4.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p1SFtEVR007270 for ; Mon, 28 Feb 2011 10:55:48 -0500 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 0FC966E8078 for ; Mon, 28 Feb 2011 11:14:46 -0500 (EST) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p1SGEigH181844 for ; Mon, 28 Feb 2011 11:14:45 -0500 Received: from d03av05.boulder.ibm.com (loopback [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p1SGDZSr007209 for ; Mon, 28 Feb 2011 09:13:35 -0700 Received: from d03nm128.boulder.ibm.com (d03nm128.boulder.ibm.com [9.17.195.32]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p1SGDZ3d007198; Mon, 28 Feb 2011 09:13:35 -0700 In-Reply-To: References: Subject: Re: Help with files changed outside of svn X-KeepSent: 64BE8E94:C25B775A-87257845:005891AC; type=4; name=$KeepSent To: Andy Levy Cc: users@subversion.apache.org X-Mailer: Lotus Notes Build V852_M2_03302010 March 30, 2010 Message-ID: From: Christopher D Haakinson Date: Mon, 28 Feb 2011 11:13:27 -0500 X-MIMETrack: Serialize by Router on D03NM128/03/M/IBM(Release 8.5.1FP2|March 17, 2010) at 02/28/2011 09:13:35 MIME-Version: 1.0 Content-type: multipart/related; Boundary="0__=08BBF2D6DFCB173C8f9e8a93df938690918c08BBF2D6DFCB173C" X-Content-Scanned: Fidelis XPS MAILER X-Virus-Checked: Checked by ClamAV on apache.org --0__=08BBF2D6DFCB173C8f9e8a93df938690918c08BBF2D6DFCB173C Content-type: multipart/alternative; Boundary="1__=08BBF2D6DFCB173C8f9e8a93df938690918c08BBF2D6DFCB173C" --1__=08BBF2D6DFCB173C8f9e8a93df938690918c08BBF2D6DFCB173C Content-type: text/plain; charset=US-ASCII Content-transfer-encoding: quoted-printable I mean that I have a working copy of my project under: /svn/hooks This folder gets automatically updated with svn update on every commit = with a post-commit hook This folder also is "live", meaning that the files here are in use at a= ll times, so nobody will be using this "working copy" as their development= copy, it's just there to receive all the newest changes. The scenario I want to test and know how to handle is when a file in /svn/hooks gets changed outside of svn and these changes never get commited into svn. I understand what svn is and is not, but the files I will have inside s= vn will also be available and writable on a network, so I need to know how= to handle files that get changed inside my live working folder outside of = svn. Also is there a way to change what gets written to a file when this occ= urs? All my scripts get corrupted because of the >>>>>>> and I'd like to at least put a # in front so that it's a commented line and doesn't affect= the execution... |------------> | From: | |------------> >--------------------------------------------------------------------= -----------------------------------------------------------------------= ------| |Andy Levy = = | >--------------------------------------------------------------------= -----------------------------------------------------------------------= ------| |------------> | To: | |------------> >--------------------------------------------------------------------= -----------------------------------------------------------------------= ------| |Christopher D Haakinson/Raleigh/IBM@IBMUS = = | >--------------------------------------------------------------------= -----------------------------------------------------------------------= ------| |------------> | Cc: | |------------> >--------------------------------------------------------------------= -----------------------------------------------------------------------= ------| |users@subversion.apache.org = = | >--------------------------------------------------------------------= -----------------------------------------------------------------------= ------| |------------> | Date: | |------------> >--------------------------------------------------------------------= -----------------------------------------------------------------------= ------| |02/28/2011 11:02 AM = = | >--------------------------------------------------------------------= -----------------------------------------------------------------------= ------| |------------> | Subject: | |------------> >--------------------------------------------------------------------= -----------------------------------------------------------------------= ------| |Re: Help with files changed outside of svn = = | >--------------------------------------------------------------------= -----------------------------------------------------------------------= ------| On Mon, Feb 28, 2011 at 10:54, Christopher D Haakinson wrote: > 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 fi= nd 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 chang= es. > Now I went through my command shell and manually changed a file outsi= de of > svn. > Then I went back to my windows box and editted the same file with a > different change. Do you mean to say that you edited the same file in multiple working copes? There is no "outside" svn as svn isn't a program in which you edit files, and you can't edit directly in the repository. > 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? You have generated a merge conflict - you've changed the same line(s) of the file in 2 different ways. > 3) And now how do I get these files merged back into one copy with th= e > changes made inside svn included and the changes made outside svn excluded? You must now resolve the conflicts. See http://svnbook.red-bean.com/nightly/en/svn.tour.cycle.html#svn.tour.cyc= le.resolve As I said above, there is no "outside vs. inside svn" - you apparently have changes made from 2 different working copies. This is a normal situation but Subversion cannot handle this for you automatically - YOU must tell Subversion which content is correct. = --1__=08BBF2D6DFCB173C8f9e8a93df938690918c08BBF2D6DFCB173C Content-type: text/html; charset=US-ASCII Content-Disposition: inline Content-transfer-encoding: quoted-printable

I mean that I have a working copy of my project under:
/svn/hooks

This folder gets automatically updated with svn update on every commit = with a post-commit hook
This folder also is "live", meaning that the files here are i= n use at all times, so nobody will be using this "working copy&quo= t; as their development copy, it's just there to receive all the newest= changes.

The scenario I want to test and know how to handle is when a file in /s= vn/hooks gets changed outside of svn and these changes never get commit= ed into svn.

I understand what svn is and is not, but the files I will have inside s= vn will also be available and writable on a network, so I need to know = how to handle files that get changed inside my live working folder outs= ide of svn.



Also is there a way to change what gets written to a file when this occ= urs? All my scripts get corrupted because of the >>>>>&g= t;> and I'd like to at least put a # in front so that it's a comment= ed line and doesn't affect the execution...

3D"InactiveAndy Levy ---02/28/2011 11:02= :11 AM---On Mon, Feb 28, 2011 at 10:54, Christopher D Haakinson<= br>
= = <= /tr> =
3D=
From:		= 3D""
Andy Levy <andy.levy@gmail.com>
3D=
To:
Christopher D Haakinson/Raleigh/IBM@IBMUS
3D=
Cc:		3D""
users@subversion.apache.org
3D=
Date:		= 3D""
02/28/2011 11:02 AM
3D=
Subject:		3D""
Re: Help with files changed outside of svn




On Mon, Feb 28, 2011 at 10:54, Christopher D Haakinson
<cdhaakin@us.ibm.com> wrote:
> I'm fairly new to svn, and I have things set up and running well.<= br> >
> I wanted to test out a scenario where a file controlled by svn get= s 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. Chec= ked it out
> onto my windows box and made a small change, then committed the ch= anges.
> Now I went through my command shell and manually changed a file ou= tside of
> svn.
> Then I went back to my windows box and editted the same file with = a
> different change.

Do you mean to say that you edited the same file in multiple working copes? There is no "outside" svn as svn isn't a program in wh= ich you
edit files, and you can't edit directly in the repository.

> 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 o= f my files?
> 2) What are the 3 copies of this file for?

You have generated a merge conflict - you've changed the same line(s) of the file in 2 different ways.

> 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?

You must now resolve the conflicts. See
http://svnbook.red-bean.com/nightly/en/= svn.tour.cycle.html#svn.tour.cycle.resolve

As I said above, there is no "outside vs. inside svn" - you a= pparently
have changes made from 2 different working copies. This is a normal
= situation but Subversion cannot handle this for you automatically -
= YOU must tell Subversion which content is correct.


= --1__=08BBF2D6DFCB173C8f9e8a93df938690918c08BBF2D6DFCB173C-- --0__=08BBF2D6DFCB173C8f9e8a93df938690918c08BBF2D6DFCB173C Content-type: image/gif; name="graycol.gif" Content-Disposition: inline; filename="graycol.gif" Content-ID: <1__=08BBF2D6DFCB173C8f9e8a93df938@us.ibm.com> Content-transfer-encoding: base64 R0lGODlhEAAQAKECAMzMzAAAAP///wAAACH5BAEAAAIALAAAAAAQABAAAAIXlI+py+0PopwxUbpu ZRfKZ2zgSJbmSRYAIf4fT3B0aW1pemVkIGJ5IFVsZWFkIFNtYXJ0U2F2ZXIhAAA7 --0__=08BBF2D6DFCB173C8f9e8a93df938690918c08BBF2D6DFCB173C Content-type: image/gif; name="ecblank.gif" Content-Disposition: inline; filename="ecblank.gif" Content-ID: <2__=08BBF2D6DFCB173C8f9e8a93df938@us.ibm.com> Content-transfer-encoding: base64 R0lGODlhEAABAIAAAAAAAP///yH5BAEAAAEALAAAAAAQAAEAAAIEjI8ZBQA7 --0__=08BBF2D6DFCB173C8f9e8a93df938690918c08BBF2D6DFCB173C--