subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r906498 - in /subversion/branches/1.6.x-issue3573: ./ subversion/libsvn_wc/props.c subversion/tests/cmdline/update_tests.py
Date Thu, 04 Feb 2010 14:35:55 GMT
Author: pburba
Date: Thu Feb  4 14:35:55 2010
New Revision: 906498

URL: http://svn.apache.org/viewvc?rev=906498&view=rev
Log:
On the 1.6.x-issue3573 branch, merge r906305 from trunk.

Modified:
    subversion/branches/1.6.x-issue3573/   (props changed)
    subversion/branches/1.6.x-issue3573/subversion/libsvn_wc/props.c
    subversion/branches/1.6.x-issue3573/subversion/tests/cmdline/update_tests.py

Propchange: subversion/branches/1.6.x-issue3573/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  4 14:35:55 2010
@@ -54,4 +54,4 @@
 /subversion/branches/tc_url_rev:870696-870828
 /subversion/branches/tree-conflicts:864636-869499
 /subversion/branches/tree-conflicts-notify:870271-870353
-/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,879093,879688,880274-880275,880370,880450,880474,880525-880526,881905,884842,886164,886197,888715,888979,889081,889840,895514,895653,896522,900797,906256
+/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,879093,879688,880274-880275,880370,880450,880474,880525-880526,881905,884842,886164,886197,888715,888979,889081,889840,895514,895653,896522,900797,906256,906305

Modified: subversion/branches/1.6.x-issue3573/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3573/subversion/libsvn_wc/props.c?rev=906498&r1=906497&r2=906498&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3573/subversion/libsvn_wc/props.c (original)
+++ subversion/branches/1.6.x-issue3573/subversion/libsvn_wc/props.c Thu Feb  4 14:35:55 2010
@@ -926,7 +926,7 @@
       SVN_ERR(svn_mergeinfo_parse(&from, from_prop_val->data, pool));
       SVN_ERR(svn_mergeinfo_parse(&to, to_prop_val->data, pool));
       SVN_ERR(svn_mergeinfo_diff(deleted, added, from, to,
-                                 FALSE, pool));
+                                 TRUE, pool));
     }
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/1.6.x-issue3573/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3573/subversion/tests/cmdline/update_tests.py?rev=906498&r1=906497&r2=906498&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3573/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/branches/1.6.x-issue3573/subversion/tests/cmdline/update_tests.py Thu Feb 
4 14:35:55 2010
@@ -4800,7 +4800,7 @@
   # Update the WC (to r8), the mergeinfo on A_COPY should now have both
   # the local mod from the uncommitted merge (/A:3* --> /A:3) and the change
   # brought down by the update (/A:3* --> /A:3*,5) leaving us with /A:3,5.
-  ### Currently this fails because of issue #3573.  The local mergeinfo change
+  ### This was failing because of issue #3573.  The local mergeinfo change
   ### is reverted, leaving '/A:3*,5' on A_COPY.
   svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
   svntest.actions.run_and_verify_svn(None, [A_COPY_path + " - /A:3,5\n"], [],
@@ -4872,7 +4872,7 @@
               tree_conflict_uc2_schedule_re_add,
               set_deep_depth_on_target_with_shallow_children,
               update_wc_of_dir_to_rev_not_containing_this_dir,
-              XFail(mergeinfo_updates_merge_with_local_mods),
+              mergeinfo_updates_merge_with_local_mods,
              ]
 
 if __name__ == '__main__':



Mime
View raw message