subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alex Kravets <kravets....@gmail.com>
Subject Re: .edited file creation
Date Mon, 04 Jun 2012 19:49:48 GMT
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
>

Mime
View raw message