[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: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-01-09 19:27:03 CET

Ben Collins-Sussman <sussman@collab.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
> If no one objects, I'll file an enhancement issue. Really, this is
> probably a five-minute code change too. :-)

If I was being ambitious (I like that phrase, it describes things I
would like to see but probably won't implement :) I would derive the
label from the two URLs, using the first non-matching component of the
URL, or the last component if they all match. So

   svn merge http://server/repo/trunk http://server/repo/branch/foo

produces files ???.trunk.r123 ???.branch.r123, and

   svn merge -r123:456 http://server/repo/branch/foo

produces files ???.foo.r123 ???.foo.r456.

Philip Martin
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:27:51 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.