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

RE: merging enchancement request

From: Sander Striker <striker_at_apache.org>
Date: 2003-01-09 19:06:01 CET

> From: Florin Iucha [mailto:florin@iucha.net]
> Sent: Thursday, January 09, 2003 7:01 PM

> On Thu, Jan 09, 2003 at 06:43:54PM +0100, Sander Striker wrote:
>>> From: sussman@collab.net [mailto:sussman@collab.net]
>>> Sent: Thursday, January 09, 2003 6:21 PM
>>> Yes. In diff3 parlance, they'd be called "older" and "yours", but
>>> many of us think that's even more confusing than "left" and "right".
>> What about 'original', 'modified' and 'latest'? This is the terminology
>> we can up with while designing the diff API.
> And what if 'latest' is not really latest?

original == original from the repository (aka textbase)
modified == modified copy in the working copy
latest == version from the repository you are trying to update to (aka
            the new textbase).
> Also please don't forget that any labels we come up with have to be
> localized.

Sure, more colors for the bikeshed ;)


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 9 19:06:47 2003

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.