Re: Conflict file naming

"Michael Pilato" <[email protected]> Thu, 5 Jan 2006 09:51:00 -0800
Newsgroups gmane.comp.version-control.subversion.devel,gmane.mail.eyebrowse.user
Message-ID <1136483460.19243.29.camel__46785.9781616882$1136487069$gmane$org@localhost.localdomain>
On Thu, 2006-01-05 at 09:42 -0600, [email protected] wrote:
> "Michael Pilato" <[email protected]> writes:
> > Bah.  We've always had entries-file data and 'svn info' output to
> > accurately reveal the correct names of conflict files, if any.  If folks
> > are careless enough to write scripts that completely ignore easily
> > query-able sources of canonical information like that in favor of whack
> > guesses based on file naming schemes, I've no sympathy for them.
> 
> No, the issue isn't discovering the name -- that part's easy.  The
> issue is that when you load these files into editors (or other
> programs) that use file-extension as a way of determining file type,
> then all of a sudden things don't work right.
> 
> File extensions have been a semi-standardized source of information
> for many, many years.  I feel like it's Subversion that's misbehaving
> here: when we add our own extension, we're blowing away useful data.
> If adding our own extension were our only choice, I'd say fine, let's
> do it.  But there's no need for it -- we could just as easily put the
> Subversion-specific portion elsewhere in the filename.

I agree, and I think you simply misunderstood me.

I wasn't bah'ing the idea of preserving the file extension when
generating conflict files -- I'm so +1 on that.  I was bah'ing the idea
that Subversion's use of .mine and .rNN provide, in and of themselves,
some sort of contract with our users.

-- 
C. Michael Pilato <[email protected]> 
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand
signature.asc (application/pgp-signature, 189 B)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)

iD8DBQBDvVyEokEGqRcG/W4RAj1vAJ4vU4BiEz8CCNsBlipKNo8BeNm57wCePYoa
itfJSzDNCdbnZ6zVC1svnaw=
=RVFa
-----END PGP SIGNATURE-----