Re: Conflict file naming
Martin Furter <[email protected]> Thu, 5 Jan 2006 20:22:47 +0100 (CET)
| Newsgroups | gmane.comp.version-control.subversion.devel,gmane.mail.eyebrowse.user |
|---|---|
| Message-ID | <Pine.BSO.4.62.0601052020190.29580__44161.6407050335$1136492566$gmane$org@uruz.rola.ch> |
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: [email protected] For additional commands, e-mail: [email protected]