[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-01-09 18:21:29 CET

Eric Hanchrow <offby1@blarg.net> writes:

> The enhancement I'm recommending is that we add the words 'left' and
> 'right' to our output suffixes, to disambiguate:
>
> filename.UUID.mine
> filename.UUID.left.r182
> filename.UUID.right.r182
>
> I assume that the "left" one corresponds to the first URL on the
> "merge" command line, and the "right" one corresponds to the second
> URL, correct?

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".

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 9 18:24:15 2003

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