[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: <kfogel_at_collab.net>
Date: 2006-01-05 15:01:50 CET

Daniel Serodio <daniel.listas@xxx.com.br> writes:
> Ryan Schmidt wrote:
> > On Jan 5, 2006, at 11:43, Troels Arvin wrote:
> >> When a conflict is detected during updates, Subversion creates a
> >> number of
> >> files, e.g.
> >> foo.doc.mine
> >> foo.doc.r63
> >> foo.doc.r64
> >>
> >> 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
> >
> > That sounds like a great idea to me, but I don't think Subversion
> > currently gives you any control of that, nor does searching the issue
> > tracker for "conflict" show me any relevant bug reports / feature
> > requests.
> Sounds like a great idea to me too, can you file a RFE about it?

I too thought we had an issue for this, but I can't find any. Yes,
please file an enhancement-request issue (pointing to this thread).
Frankly, I don't think we even need a config control for this -- it
ought to be the default behavior.

Although of course, any examples in the book(s) and FAQ will need to
be updated if we change this behavior. Mmm, and worse, some programs
might be depending on it. In other words, the current practice of
putting the Subversion-specific extension on the end might be
considered an API of sorts.

I've CC'd dev@ to see what people there think.


www.collab.net  <>  CollabNet  |  Distributed Development On Demand
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 5 16:42:47 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.