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

Re: Conflict file naming

From: Martin Furter <mf_at_rola.ch>
Date: 2006-01-05 20:22:47 CET

On Thu, 5 Jan 2006, [ISO-8859-1] Nicolás Lichtmaier wrote:

>
>>>>> Is it possible to tell the Subversion client to use other namings for
>>>>> the .mine and before/after-revision files, e.g.:
>>>>>
>>>>> foo.mine.doc
>>>>> foo.r63.doc
>>>>> foo.r64.doc
>>>>>
>
>
> Now that this is being analyzed, wouldn't it be better to use something like:
>
> mine-foo.doc (or my-foo.doc)
> r63-foo.doc
> r64-foo.doc
>
> ... so that files with double extensions still work (tar.gz).
>
> Perhaps, it would be better to keep these files together in a "sort by name"
> list:
>
> svn-mine-foo.doc (or my-foo.doc)
> svn-r63-foo.doc
> svn-r64-foo.doc

+1 I like this idea, it makes the conflict a bit more visible.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 5 21:23:19 2006

This is an archived mail posted to the Subversion Dev mailing list.