[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: Daniel L. Rall <dlr_at_finemaltcoding.com>
Date: 2007-10-06 00:14:23 CEST

On Fri, 05 Oct 2007, Jack Repenning wrote:

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

This is a pretty big assumption for a user who's mixing 1.5 and < 1.5
tool chains. :-p

More specifically, it will be a "problem" for other more knowledgable
users working with the same repository (they'll have to re-merge a set
of changes, once). But, it'll be no more of a "problem" than it was when
working with 1.4 and previous releases.

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

Yes, and record the absent mergeinfo for those changs, "fixing" the
merge history.

  • application/pgp-signature attachment: stored
Received on Sat Oct 6 00:14:32 2007

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