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

Re: We should bump WC format version number for 1.5. - Merge tracking & Changelist support

From: Jack Repenning <jrepenning_at_collab.net>
Date: 2007-10-06 00:05:53 CEST

On Oct 5, 2007, at 2:56 PM, Daniel L. Rall wrote:

> However, enforcing a minimum client version isn't an unreasonable
> desire:
> 1.4 clients won't set mergeinfo for merge/copy/move operations,
> meaning
> that merge history will be lost (unless subsequently manually updated
> using 'svn propedit', something which I'd strongly recommend that the
> average user should not do, given our complex inheritance rules).
> You won't
> be any worse off than you were with 1.4, but it's annoying none the
> less.

I think you will be very much worse off, because you will be
conditioned to suppose that the merge info is there, yet it is not.
If, for example, the merge unknowingly made with a 1.4 client
included some non-conflicting changes that ought to be "mine" (as
we're now learning to call it), and they were fixed up to be so by
editing the merge-result file, then a subsequent 1.5-client merge
will again apply the (presumably still non-conflicting) changes,

Jack Repenning
Chief Technology Officer
CollabNet, Inc.
8000 Marina Boulevard, Suite 600
Brisbane, California 94005
office: +1 650.228.2562
mobile: +1 408.835.8090
raindance: +1 877.326.2337, x844.7461
aim: jackrepenning
skype: jrepenning

Received on Sat Oct 6 00:06:08 2007

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.