subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bre...@apache.org
Subject svn commit: r1482451 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_wc/entries.c subversion/tests/cmdline/upgrade_tests.py subversion/tests/cmdline/upgrade_tests_data/changelist_upgrade_1_6.tar.bz2
Date Tue, 14 May 2013 16:51:17 GMT
Author: breser
Date: Tue May 14 16:51:16 2013
New Revision: 1482451

URL: http://svn.apache.org/r1482451
Log:
Merge the r1482327 group from trunk:

 * r1482327, r1482338
   Resolve segfault on upgrading from pre 1.7 working copies, where there
   are local property changes or conflicts or changelist, but no tree conflict.
   Justification:
     Regression from 1.7.
   Votes:
     +1: philip, breser, rhuijben

Added:
    subversion/branches/1.8.x/subversion/tests/cmdline/upgrade_tests_data/changelist_upgrade_1_6.tar.bz2
      - copied unchanged from r1482338, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/changelist_upgrade_1_6.tar.bz2
Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_wc/entries.c
    subversion/branches/1.8.x/subversion/tests/cmdline/upgrade_tests.py

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1482327,1482338

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1482451&r1=1482450&r2=1482451&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue May 14 16:51:16 2013
@@ -85,14 +85,6 @@ Approved changes:
 # blocking issues.  If in doubt see this link for details:
 # http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
 
- * r1482327, r1482338
-   Resolve segfault on upgrading from pre 1.7 working copies, where there
-   are local property changes or conflicts or changelist, but no tree conflict.
-   Justification:
-     Regression from 1.7.
-   Votes:
-     +1: philip, breser, rhuijben
-
  * r1481596
    For 'svn log -g', eliminate read requests on directories and mergeinfo
    in revisions that are guaranteed to not change any mergeinfo.

Modified: subversion/branches/1.8.x/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_wc/entries.c?rev=1482451&r1=1482450&r2=1482451&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_wc/entries.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_wc/entries.c Tue May 14 16:51:16 2013
@@ -1565,7 +1565,9 @@ insert_actual_node(svn_sqlite__db_t *sdb
                                 actual_node->conflict_new,
                                 actual_node->prop_reject,
                                 actual_node->tree_conflict_data,
-                                strlen(actual_node->tree_conflict_data),
+                                actual_node->tree_conflict_data
+                                    ? strlen(actual_node->tree_conflict_data)
+                                    : 0,
                                 scratch_pool, scratch_pool));
 
   if (conflict_data)

Modified: subversion/branches/1.8.x/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/cmdline/upgrade_tests.py?rev=1482451&r1=1482450&r2=1482451&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/branches/1.8.x/subversion/tests/cmdline/upgrade_tests.py Tue May 14 16:51:16
2013
@@ -1408,6 +1408,23 @@ def iprops_upgrade1_6(sbox):
                     'iprops_upgrade_root1_6.tar.bz2',
                     sbox)
 
+def changelist_upgrade_1_6(sbox):
+  "upgrade from 1.6 with changelist"
+
+  sbox.build(create_wc = False)
+  svntest.main.run_svnadmin('setuuid', sbox.repo_dir,
+                            'aa4c97bd-2e1a-4e55-a1e5-3db22cff2673')
+  replace_sbox_with_tarfile(sbox, 'changelist_upgrade_1_6.tar.bz2')
+  svntest.actions.run_and_verify_svn(None, None, [], 'upgrade', sbox.wc_dir)
+
+  exit_code, output, errput = svntest.main.run_svn(None, 'info', sbox.wc_dir,
+                                                   '--depth', 'infinity',
+                                                   '--changelist', 'foo')
+  paths = [x for x in output if x[:6] == 'Path: ']
+  expected_paths = ['Path: %s\n' % sbox.ospath('A/D/gamma')]
+  if paths != expected_paths:
+    raise svntest.Failure("changelist not matched")
+
 ########################################################################
 # Run the tests
 
@@ -1462,6 +1479,7 @@ test_list = [ None,
               upgrade_from_1_7_conflict,
               iprops_upgrade,
               iprops_upgrade1_6,
+              changelist_upgrade_1_6,
              ]
 
 



Mime
View raw message