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

Re: [PATCH]: Was [PROPOSAL] Takeover Take 2

From: Paul Burba <paulb_at_softlanding.com>
Date: 2006-05-08 15:26:06 CEST

Daniel Rall <dlr@collab.net> wrote on 05/05/2006 08:50:49 PM:

> On Fri, 05 May 2006, Philip Martin wrote:
> > Paul Burba <paulb@softlanding.com> writes:
> > > Note: When a file or dir exists prior to a forced checkout and
> > > during the co, it is reported as
> > >
> > > "T WC_PATH/PATH"
> > >
> > > rather than
> > >
> > > "A WC_PATH/PATH"
> > >
> > > "T" of course stands for takenover. This applies to use cases C, D,
> > > and H.
> >
> > We already use 'T' for a "sTolen" lock during update. If update can
> > also takeover then we really need to use some other letter, how about
> > 'V' for "takenoVer"? Even if we don't change update I think it would
> > be a good idea to avoid reusing 'T'.

Currently checkout reports paths only as 'A Added'. Update uses that
too, as well as 'D Deleted', 'U Updated', 'C Conflict', and 'G Merged'.
 I can understand not wanting to reuse a letter/symbol from the first two
columns of status (i.e. ' ', 'A', 'C', 'D', 'I', 'M', 'R', 'X', '?', '!',
'~'). But must we really avoid using the letters from the other columns
of status?

> It looks like Garrett used 'V' on the fs-atomic-renames branch to
> represent a 'moVe' operation:
> I assume he's intending the same for status output. While
> fs-atomic-renames hasn't been merged into the mainline yet, how about
> 'K' instead? 'K' is not currently used in the first column of status
> output (though is in the 6th, for 'locked in repository, lock toKen
> present').

Perhaps "takeover" is the problem. It's really just a holdover term from
Jonathan Gilbert's original patch.

Maybe something completely new like "obstructed" or "blocked" is better?
Though there isn't a good single letter for those if we avoid reusing any
letters currently employed by status...'E' is the only choice.

Paul B.

P.S. FWIW I'd thought about using 'M Modified' when a path is obstructed.
 It makes a lot of sense (to me) for files, but for directories it seems

Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc 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 Mon May 8 15:26:36 2006

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