[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: Peter Davis <peter_at_pdavis.cx>
Date: 2003-01-09 20:29:50 CET

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Thursday 09 January 2003 10:23, Karl Fogel wrote:
> 'original', `modified', and 'requested', how about? (To avoid the
> confusion where 'latest' might not mean HEAD.)

What about Phillip's suggestion, since obviously it will be hard to reach a
concensus along these lines?

Use the last non-identical path component from each URL, or the last
component if both URLs are the same (in which case the .rX and .rY would
distinguish the conflict files). Doing that seems *much* less confusing
to me, since I'm already confused enough just trying to remember which
order to list the arguments when using normal "diff" :-)

- --
Peter Davis
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)

iD8DBQE+Hc2uhDAgUT1yirARAnkIAJ9ewKII6QZZfR+3tyyzQ2uUmgb8TgCgiMJx
UL2zZMN09E8HJV215qvKnio=
=d0z8
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 9 20:33:21 2003

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