Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (nike.apache.org: domain of kravets.dev@gmail.com
 designates 209.85.212.181 as permitted sender)
MIME-Version: 1.0
In-Reply-To: 
 <CADUNgu3C6hYTUZmmEMW_0K0b8Fu+OtPKKZSfLr1zPMSmPbVdEQ@mail.gmail.com>
References: 
 <CADUNgu3C6hYTUZmmEMW_0K0b8Fu+OtPKKZSfLr1zPMSmPbVdEQ@mail.gmail.com>
From: Alex Kravets <kravets.dev@gmail.com>
Date: Mon, 4 Jun 2012 15:49:48 -0400
Message-ID: 
 <CADUNgu0ikvAObWRsvNTBK-uCDnsu4cAKKVHNSzPN9GHU5DM6CA@mail.gmail.com>
Subject: Re: .edited file creation
To: users@subversion.apache.org
Content-Type: multipart/alternative; boundary=0016e6dab0e15c3bfc04c1aad73e

--0016e6dab0e15c3bfc04c1aad73e
Content-Type: text/plain; charset=ISO-8859-1

Ok, so it seems this is file with merge information that is only persisted
locally and is not made into svn during commit.

On Mon, Jun 4, 2012 at 12:10 PM, Alex Kravets <kravets.dev@gmail.com> wrote:

> Hello,
>
> When I am merging file from and conflict is found I merge changes by using
> either in-place editor or external visual editor (meld). Once I merge the
> changes and issue 'mc' I see that the file is being created with the same
> name as file that was in conflict, plus .edited append to it. Why is this
> file being created? I found this post (
> http://svn.haxx.se/dev/archive-2008-05/0155.shtml) related to the file,
> but not sure why it's created.
>
> Thanks,
> Alex
>

--0016e6dab0e15c3bfc04c1aad73e
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

Ok, so it seems this is file with merge information that is only persisted =
locally and is not made into svn during commit.<br><br><div class=3D"gmail_=
quote">On Mon, Jun 4, 2012 at 12:10 PM, Alex Kravets <span dir=3D"ltr">&lt;=
<a href=3D"mailto:kravets.dev@gmail.com" target=3D"_blank">kravets.dev@gmai=
l.com</a>&gt;</span> wrote:<br>

<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
x #ccc solid;padding-left:1ex">Hello,<div><br></div><div>When I am merging =
file from and conflict is found I merge changes by using either in-place ed=
itor or external visual editor (meld). Once I merge the changes and issue &=
#39;mc&#39; I see that the file is being created with the same name as file=
 that was in conflict, plus .edited append to it. Why is this file being cr=
eated? I found this post (<a href=3D"http://svn.haxx.se/dev/archive-2008-05=
/0155.shtml" target=3D"_blank">http://svn.haxx.se/dev/archive-2008-05/0155.=
shtml</a>) related to the file, but not sure why it&#39;s created.</div>


<div><br></div><div>Thanks,</div><div>Alex</div>
</blockquote></div><br>

--0016e6dab0e15c3bfc04c1aad73e--