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

RE: Locking UI comments

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2004-10-14 18:47:05 CEST

Ben Sewell <Ben.Sewell@ricardo.com> wrote on 10/14/2004 12:08:53 PM:

> Mark Phippard <mailto:MarkP@softlanding.com> wrote on 14 October 2004
> > I assumed
> > that this was one of the reasons Subversion didn't use extensions in
> > first place.
> Presumably a file originally named index.mine.html, when clashing, would
> called index.mine.mine.html & index.mine.r1234.html (rather than
> index.mine.html.r1234 as is the alternative suggested earlier)

What I meant, was what happens if you have a conflict in file index.html
and for some reason, you actually have a real file named index.mine.html
in the same folder?

> > Would there be any value, especially in the hijack scenario, of using
> > techy names, such as:
> >
> > filename.mine.ext
> > filename.base.ext
> > filename.new/theirs/modified/conflict.ext
> Or perhaps
> filename.mine.ext
> filename.base.ext
> filename.<UID of user who last committed>.ext

What if the user name is base or mine?


Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 14 18:47:22 2004

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.