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

Re: tree-conflicts: cd into conflicted

From: Stefan Sperling <stsp_at_elego.de>
Date: Sat, 29 Nov 2008 11:05:05 +0100

On Sat, Nov 29, 2008 at 01:45:37AM +0100, Neels J Hofmeyr wrote:
> Hi tree-conflicts folks,
> I've made two scripts that show how a commit and an update is actually still
> attempted when inside a tree-conflicted dir. The second one shows that it is
> possible to get a tree-conflict within an already tree-conflicted dir.
> Currently, this doesn't weigh as heavily because having a tree-conflicted
> dir means that it was either
> - deleted in the repos. Then ci/up inside it fails because the path doesn't
> exist in the repos. Or
> - deleted in the working copy. Even though the empty directory skeleton may
> sill hang around, going into it and trying to ci will say "out of date".
> Trying to update will create another tree-conflict, because the paths have
> been removed in the repository.

We're also flagging an add/add as tree conflict:

libsvn_wc/update_editor.c, add_directory():
      /* Raise a tree conflict if this directory is already present. */
      SVN_ERR(check_tree_conflict(&tree_conflict, eb,
                                  pb->log_accum, db->path, entry,
                                  svn_node_dir, db->new_URL, pool));

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-29 11:05:44 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.