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

Re: .edited file creation

From: Alex Kravets <kravets.dev_at_gmail.com>
Date: Mon, 4 Jun 2012 15:49:48 -0400

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_at_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
>
Received on 2012-06-04 21:50:40 CEST

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.