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

changelists and entry-less tree-conflicts

From: Neels J. Hofmeyr <neels_at_elego.de>
Date: Wed, 19 Nov 2008 07:15:07 +0100

Julian Foad wrote:
> Presently, not every victim path has an
> "entry". However, I now think that a better design would be for every
> tree conflict victim to have a WC entry even if the node does not exist
> in the repository or on disk.
> Then, perhaps, the conflict could be recorded on the victim's entry, and
> the parent need not be involved.

I've gotten a new lead to this: Changelists!

For Changelists to work as intended, it is absolutely necessary to have a WC
entry for every tree-conflict, because a changelist name is stored in the entry.

If there is no entry, the conflicted item can't be in a changelist.

$ svn st
! C Foo.c
C Bar.c

$ svn changelist baz Bar.c
Path 'Bar.c' is now a member of changelist 'baz'.

$ svn st
! C Foo.c

--- Changelist 'baz':
C Bar.c

$ svn changelist baz Foo.c
svn: warning: 'Foo.c' is not under version control

How important are changelists?

Received on 2008-11-19 07:15:34 CET

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.