You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2015/04/16 06:00:41 UTC
svn commit: r1674001 - in /subversion/branches/1.9.x: ./ STATUS
subversion/libsvn_wc/diff_editor.c
Author: svn-role
Date: Thu Apr 16 04:00:41 2015
New Revision: 1674001
URL: http://svn.apache.org/r1674001
Log:
Merge r1667471 from trunk:
* r1667471
Fix bad assertion in diff callbacks
Justification:
Problem uncovered by 1.8.x code that still use these callbacks. On 1.9.x
this code is only used from some deprecated libsvn_wc functions that
used to drive the old diff code. Some third party tools might hit this
problem.
Votes:
+1: rhuijben, stefan2, philip
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/libsvn_wc/diff_editor.c
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 16 04:00:41 2015
@@ -90,4 +90,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665318,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667101,1667106-1667107,1667233,1667235,1667301,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673228,1673282,1673445,1673691
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665318,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667101,1667106-1667107,1667233,1667235,1667301,1667471,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673228,1673282,1673445,1673691
Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1674001&r1=1674000&r2=1674001&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Thu Apr 16 04:00:41 2015
@@ -175,16 +175,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1667471
- Fix bad assertion in diff callbacks
- Justification:
- Problem uncovered by 1.8.x code that still use these callbacks. On 1.9.x
- this code is only used from some deprecated libsvn_wc functions that
- used to drive the old diff code. Some third party tools might hit this
- problem.
- Votes:
- +1: rhuijben, stefan2, philip
-
* r1673153
Significantly improve 'svn ls -v' on tag directories
Justification:
Modified: subversion/branches/1.9.x/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_wc/diff_editor.c?rev=1674001&r1=1674000&r2=1674001&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_wc/diff_editor.c Thu Apr 16 04:00:41 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)