[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-10 00:12:41 CET

Greg Stein <gstein@lyra.org> writes:

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

Oops, my bad. I thought that svn_io_open_unique_file() was using apr
to generate uuid's. Instead, it's just generating pseudo-random
numbers via weird pointer printing. :-)

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:15:33 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.