[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 21:56:28 CEST

"Jonathan Gilbert" <o2w9gs702@sneakemail.com> wrote on 05/08/2006 12:46:18

> At 09:26 AM 08/05/2006 -0400, Paul Burba wrote:
> >Perhaps "takeover" is the problem. It's really just a holdover term
> >Jonathan Gilbert's original patch.
> I still think there's room for a separate "takeover" feature. I agree
> others on this list that such a feature would *not* fill in missing
> and would *only* slide the text-base under what was already there. If
> a feature were to be added, it would make sense for it, too, to use 'T'
> refer to "taken-over" files.

Hi Jonathan,

I agree that there is still room for a "takeover" feature. I don't think
my variation of your original patch in any way precludes that.

To avoid confusion I'm working to remove all "takeover" language in the
patch. Philip Martin suggested 'E' for "Exists" which I quite like.

> >P.S. FWIW I'd thought about using 'M Modified' when a path is
> > It makes a lot of sense (to me) for files, but for directories it
> >misleading.
> Doesn't 'M' during an update (which is what a checkout is) mean
> Even if the uses were kept strictly segregated with respect to the
> command-line options given, I think it'd still be somewhat uncomfortable
> have *the same block of code* (the 'update' engine) use the same status
> letter for 2 different things.

Merged is represented with a 'G' during an update:

  svn update --help
    For each updated item a line will start with a character reporting the
    action taken. These characters have the following meaning:

      A Added
      D Deleted
      U Updated
      C Conflict
      G Merged

    A character in the first column signifies an update to the actual
    while updates to the file's properties are shown in the second column.

Paul B.

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 21:57:32 2006

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