[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-issues
Subject:    [Issue 3496]  treeconflicts.c should not exit merge when tree
From:       Julian Foad <julianfoad () btopenworld ! com>
Date:       2009-09-23 10:36:16
Message-ID: 20090923103616.7A794FCC0DC () sc157-tigr ! sjc ! collab ! net
[Download RAW message or body]

http://subversion.tigris.org/issues/show_bug.cgi?id=3496






------- Additional comments from julianfoad@tigris.org Wed Sep 23 03:36:14 -0700 2009 -------
I believe the reporter meant the function svn_wc__add_tree_conflict(), where it
says:

  /* Re-adding an existing tree conflict victim is an error. */
  [...]
  if (existing_conflict != NULL)
    return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL,
                             _("Attempt to add tree conflict that already "
                               "exists at '%s'"), [...]conflict->path[...]);

This is closely related to issue #3486 "attempt to add tree conflict that
already exists", which is about fixing the cases that lead to that error. This
present issue #3496 is a preliminary or complementary approach to the same class
of problems, aiming to keep Subversion usable even if there are such bugs.

I think there is merit in doing both, because:
  * attempts to fix issue #3486 are taking a long time and it is not clear if we
will ever be able to guarantee it is fixed;
  * it seems likely that we can make svn continue safely after this error
(without causing any corruption or losing any data);
  * and the consequences of hitting this error in a big merge are dire (there is
no good work-around).

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=463&dsMessageId=2398819

To unsubscribe from this discussion, e-mail: [issues-unsubscribe@subversion.tigris.org].
[prev in list] [next in list] [prev in thread] [next in thread]