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

SV: Conflict file naming

From: Troels Arvin <TAR_at_xponcard.dk>
Date: 2006-01-06 13:00:04 CET

kfogel@newton.ch.collab.net wrote:
> Yes, please file an enhancement-request issue

Done: http://subversion.tigris.org/issues/show_bug.cgi?id=2474

> Frankly, I don't think we even need a config
> control for this -- it ought to be the default behavior.

I agree. But of course, there is an issue of backwards-compatibility.

I'm thinking that it could be done by
 - Creating new conflict files using the new naming scheme.
 - "svn resolved" starts assuming the new naming scheme; if
   no files are found in that search, try looking for files
   using the old naming scheme.

Greetings from Troels Arvin <tar@xponcard.dk> 
Phone: +45 44506550
Received on Fri Jan 6 13:02:08 2006

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.