[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: Greg Stein <gstein_at_lyra.org>
Date: 2003-01-10 00:07:56 CET

On Thu, Jan 09, 2003 at 10:37:56AM -0600, Ben Collins-Sussman wrote:
> When our merge process discovers a conflict, we drop three fulltext
> files into the working directory:
> filename.UUID.mine
> filename.UUID.rX
> filename.UUID.rY

They aren't UUIDs. And presuming that you're not suggesting we change to use
UUIDs, then I'd recommend that you use a different term. Otherwise, it is
just confusing.

And if you *are* suggesting that we put a UUID in there, I think I'm gonna
have to purchase a flight to Chicago just so I can give you a good smack
upside the head :-)

I'll leave the rest of the bikeshed to others...


Greg Stein, http://www.lyra.org/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jan 10 00:06:48 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.