[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Mixed Direction Merges and Range Compaction (Was: Auto-selection of merge source URL)

From: David O'Shea <david.oshea_at_s3group.com>
Date: Tue, 08 Jan 2008 14:43:24 +0000

On 08/01/2008 14:36, David Glasser wrote:
> On Jan 8, 2008 9:28 AM, C. Michael Pilato <cmpilato_at_collab.net> wrote:
>> I think I favor doing no pre-processing *at all* of the requested ranges.
>> Let users ask for what they want; let them get what they asked for. So,
>> allow mixed revisions, allow dupes, allow overlaps -- the whole shebang.
>> Remember, we do our range looping high in the call stack of a merge
>> operation. If our merge tracking can't deal with these conditions in a
>> single 'svn merge' invocation, it can't deal with them across multiple 'svn
>> merge' invocations (and is therefore pretty much useless).
> This does seem reasonable. On the other hand, I am still attracted to
> the original reason for suggesting no mixed directions, which is to
> provide a different default merge source URL for forward vs reverse
> merges.

What about doing this but mandating a source URL in the case of mixed


David O'Shea
The information contained in this e-mail and in any attachments is confidential and is designated solely for the attention of the intended recipient(s). If you are not an intended recipient, you must not use, disclose, copy, distribute or retain this e-mail or any part thereof. If you have received this e-mail in error, please notify the sender by return e-mail and delete all copies of this e-mail from your computer system(s).
Please direct any additional queries to: communications_at_s3group.com.
Thank You.
Silicon and Software Systems Limited. Registered in Ireland no. 378073.
Registered Office: South County Business Park, Leopardstown, Dublin 18
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-01-08 15:44:51 CET

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