svn commit: r1667471 - /subversion/trunk/subversion/libsvn_wc/diff_editor.c

[rh...@apache.org]

Author: rhuijben
Date: Wed Mar 18 09:02:38 2015
New Revision: 1667471

URL: http://svn.apache.org/r1667471
Log:
Fix a bad assertion in the diff callback wrappers that tried to check that
a node wasn't added and existed at the same time.

This function will be called for adds, simple-changes and deletes, and
as such determines what happens based on these arguments. Because these
old diff callbacks didn't pass all information on their users the converted
drivers sometimes just forgot to pass information (such as copyfrom). One
of the drivers was recently fixed on 1.8.x and uncovered this problem.

* subversion/libsvn_wc/diff_editor.c
  (wrap_dir_opened): Fix bad assertion.

Modified:
    subversion/trunk/subversion/libsvn_wc/diff_editor.c

Modified: subversion/trunk/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_editor.c?rev=1667471&r1=1667470&r2=1667471&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_editor.c Wed Mar 18 09:02:38 2015
@@ -2404,8 +2404,8 @@ wrap_dir_opened(void **new_dir_baton,
   wc_diff_wrap_baton_t *wb = processor->baton;
   svn_boolean_t tree_conflicted = FALSE;
 
-  assert(left_source || right_source);
-  assert(!copyfrom_source || !right_source);
+  assert(left_source || right_source);      /* Must exist at one point. */
+  assert(!left_source || !copyfrom_source); /* Either existed or added. */
 
   /* Maybe store state and tree_conflicted in baton? */
   if (left_source != NULL)