[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-05 23:56:20 CEST

On Fri, 05 Oct 2007, Vincent Lefevre wrote:

> On 2007-10-05 15:13:48 +0200, Erik Huelsmann wrote:
> > On 10/5/07, Bert Huijben <bert@vmoo.com> wrote:
> > > Merge tracking will give 1.4 clients+users a hard time on updates
> > > and merges as they don't have any builtin merge support for the
> > > svn:mergeinfo property.
> I don't think this is much a problem: merge tracking is already
> absent from 1.4. So, for 1.4 users (who need to use 1.5 clients
> too just because they are installed on some machines), there will
> be no practical change. Or is there anything I've missed?

In the case where you've got a 1.4 WC, unless you've made manual changes
to the "svn:mergeinfo" property on a path, changes pulled down from the
repository (e.g. via 'svn update') are not likely to conflict.

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.

Using the WC format to help enforce a minimum client version isn't an
entirely unreasonable way to go here.

> > > Looking through svn_entries I found these other wc additions since 1.4.X:
> > > - changelist
> > > File registration on a changelist is reset
> >
> > Yes, I guess that would be a problem.
> What would be the practical consequences for the user?
> > > - keep_local (impacts directories only)
> > > svn rm --keep-local dir
> > > Won't keep directory
> >
> > That too would be a problem.
> Same question.

For both these cases, as with --depth (or -N), information stored in the
user's WC will be irrevocably lost. Record that you wanted to keep a path
around after making it unversioned, or memory of those 37 files you'd added
to a changelist would be wiped out.

Daniel Rall

  • application/pgp-signature attachment: stored
Received on Fri Oct 5 23:56:46 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.