[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: Paul Koning <pkoning_at_equallogic.com>
Date: 2006-01-06 15:53:47 CET

>>>>> "Evan" == Evan Stark <EStark@point-inc.com> writes:

 Evan> -----Original Message----- From: Gale, David - Thursday, 5
 Evan> January 2006 3:42 pm

>> Aaron Montgomery wrote:
>>> In each individual's configuration file, they should have a list
>>> of extensions....
>>> .doc .c .h .tar.gz

>> Ah! A solution I'd like! (See, I'm not impossible to please!)
>> This seems to wrap up almost everyone's positions:
>> - It preserves the current behavior by default, so existing
>> programs aren't broken. - It allows users who want the extension
>> at the end to make sure they stay at the end, without forcing it
>> on those who don't. - It handles arbitrary extensions well,
>> rather than relying on some arcane heuristic.
>> The only position it doesn't satisfy are the people who want the
>> conflict markers at the front of the filename. Perhaps, if the
>> list of extensions supported (psuedo?)regular expressions, even
>> this could be overcome. Anyone have a good idea that would make
>> it clear how to encode ".doc" (as most users would want), and ".*"
>> (as some would like), without the confusion of whether the . is a
>> literal period, or the regular-expression "any character"?

Sure, that's easy. Make it a regexp, either for the head of the
filename (the part *after* which you insert the marker) or the tail
(the part *before* which you insert it). Suppose the regexp is for
the head, then the current behavior is defined by ".*" and the
original proposal is defined by ".*\.?". Hm, I'm not sure how to
encode Aaron's example (you'd need "not" on a regexp group -- is there
such a construct?)

 Evan> If this is a client issue, would it make sense for clients that
 Evan> know about the client platform (such as TortoiseSVN) to pay
 Evan> attention to the extensions actually associated with
 Evan> applications?

Not necessarily, though it would make a nice option. I have .cpp as a
registered extension on my client, but I don't usually use the
application that owns that extension. So for that one I might well
want to preserve the existing rule.

Also, using registered extensions probably doesn't cover .tar.gz --
since .gz is registered to the decompress application.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 6 15:56:39 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.