subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r1371833 [3/3] - in /subversion/branches/inheritable-props: ./ build/ build/generator/ build/generator/templates/ contrib/client-side/emacs/ contrib/client-side/svn-push/ contrib/client-side/svnmerge/ contrib/hook-scripts/enforcer/ notes/me...
Date Fri, 10 Aug 2012 22:30:20 GMT
Modified: subversion/branches/inheritable-props/subversion/svnsync/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/subversion/svnsync/main.c?rev=1371833&r1=1371832&r2=1371833&view=diff
==============================================================================
--- subversion/branches/inheritable-props/subversion/svnsync/main.c (original)
+++ subversion/branches/inheritable-props/subversion/svnsync/main.c Fri Aug 10 22:30:18 2012
@@ -301,7 +301,6 @@ check_lib_versions(void)
       { "svn_ra",    svn_ra_version },
       { NULL, NULL }
     };
-
   SVN_VERSION_DEFINE(my_version);
 
   return svn_ver_check_list(&my_version, checklist);
@@ -1858,9 +1857,10 @@ help_cmd(apr_getopt_t *os, void *baton, 
 
   SVN_ERR(svn_ra_print_modules(version_footer, pool));
 
-  SVN_ERR(svn_opt_print_help3(os, "svnsync",
+  SVN_ERR(svn_opt_print_help4(os, "svnsync",
                               opt_baton ? opt_baton->version : FALSE,
                               opt_baton ? opt_baton->quiet : FALSE,
+                              /*###opt_state ? opt_state->verbose :*/ FALSE,
                               version_footer->data, header,
                               svnsync_cmd_table, svnsync_options, NULL,
                               NULL, pool));

Modified: subversion/branches/inheritable-props/subversion/svnversion/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/subversion/svnversion/main.c?rev=1371833&r1=1371832&r2=1371833&view=diff
==============================================================================
--- subversion/branches/inheritable-props/subversion/svnversion/main.c (original)
+++ subversion/branches/inheritable-props/subversion/svnversion/main.c Fri Aug 10 22:30:18
2012
@@ -37,8 +37,8 @@
 static svn_error_t *
 version(svn_boolean_t quiet, apr_pool_t *pool)
 {
-  return svn_opt_print_help3(NULL, "svnversion", TRUE, quiet, NULL, NULL,
-                             NULL, NULL, NULL, NULL, pool);
+  return svn_opt_print_help4(NULL, "svnversion", TRUE, quiet, FALSE,
+                             NULL, NULL, NULL, NULL, NULL, NULL, pool);
 }
 
 static void
@@ -107,8 +107,8 @@ check_lib_versions(void)
       { "svn_wc",     svn_wc_version },
       { NULL, NULL }
     };
-
   SVN_VERSION_DEFINE(my_version);
+
   return svn_ver_check_list(&my_version, checklist);
 }
 

Modified: subversion/branches/inheritable-props/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1371833&r1=1371832&r2=1371833&view=diff
==============================================================================
--- subversion/branches/inheritable-props/subversion/tests/cmdline/merge_reintegrate_tests.py
(original)
+++ subversion/branches/inheritable-props/subversion/tests/cmdline/merge_reintegrate_tests.py
Fri Aug 10 22:30:18 2012
@@ -1503,7 +1503,7 @@ def multiple_reintegrates_from_the_same_
   # r12 - Do a --record-only merge from 'A' to the feature branch so we
   # don't try to merge r11 from trunk during the next sync merge.
   svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+  svntest.actions.run_and_verify_svn(None, None, [], 'merge', '-c11',
                                      '--record-only',
                                      sbox.repo_url + '/A',
                                      Feature_branch_path)

Modified: subversion/branches/inheritable-props/subversion/tests/cmdline/merge_symmetric_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/subversion/tests/cmdline/merge_symmetric_tests.py?rev=1371833&r1=1371832&r2=1371833&view=diff
==============================================================================
--- subversion/branches/inheritable-props/subversion/tests/cmdline/merge_symmetric_tests.py
(original)
+++ subversion/branches/inheritable-props/subversion/tests/cmdline/merge_symmetric_tests.py
Fri Aug 10 22:30:18 2012
@@ -301,7 +301,7 @@ def symmetric_merge(sbox, source, target
 
   exp_out = expected_symmetric_merge_output(target, expect_3ways)
   exit, out, err = svntest.actions.run_and_verify_svn(None, exp_out, [],
-                                     'merge', '--symmetric',
+                                     'merge',
                                      '^/' + source, target,
                                      *args)
 
@@ -783,8 +783,10 @@ def subtree_to_and_fro(sbox):
   # r8 - Do a subtree sync merge from ^/A/D to A_COPY/D.
   # Note that among other things this changes A_COPY/D/H/psi.
   svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge', '--symmetric',
+  svntest.actions.run_and_verify_svn(None, None, [], 'merge',
                                      sbox.repo_url + '/A/D', A_COPY_D_path)
+  svntest.actions.run_and_verify_svn(None, None, [], 'ci', wc_dir,
+                                     '-m', 'Symmetric subtree merge')
 
   # r9 - Make an edit to A/D/H/psi.
   svntest.main.file_write(psi_path, "Trunk Edit to 'psi'.\n")
@@ -798,7 +800,6 @@ def subtree_to_and_fro(sbox):
   #
   #   C:\SVN\src-trunk\Debug\subversion\tests\cmdline\svn-test-work\
   #     working_copies\merge_symmetric_tests-18>svn merge ^^/A_COPY A
-  #     --symmetric
   #   DBG: merge.c:11461: base on source: file:///C:/SVN/src-trunk/Debug/
   #     subversion/tests/cmdline/svn-test-work/repositories/
   #     merge_symmetric_tests-18/A@1
@@ -816,17 +817,17 @@ def subtree_to_and_fro(sbox):
   #   Select: (p) postpone, (df) diff-full, (e) edit,
   #           (mc) mine-conflict, (tc) theirs-conflict,
   #           (s) show all options: p
-  #   --- Merging r2 through r8 into 'A':
+  #   --- Merging r2 through r9 into 'A':
   #   C    A\D\H\psi
   #   U    A\D\gamma
-  #   --- Recording mergeinfo for merge of r2 through r8 into 'A':
+  #   --- Recording mergeinfo for merge of r2 through r9 into 'A':
   #    U   A
   #   Summary of conflicts:
   #     Text conflicts: 1
   svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
   exit_code, out, err = svntest.actions.run_and_verify_svn(
     None, [], svntest.verify.AnyOutput,
-    'merge', '--symmetric', sbox.repo_url + '/A_COPY', A_path)
+    'merge', sbox.repo_url + '/A_COPY', A_path)
 
   # The 'old' merge produced a warning that reintegrate could not be used.
   # Not claiming this is perfect, but it's better(?) than a conflict:
@@ -834,7 +835,7 @@ def subtree_to_and_fro(sbox):
                                 "in the way expected",
                                 err, None,
                                 "(svn: E195016: Reintegrate can only be used if "
-                                "revisions 2 through 8 were previously "
+                                "revisions 2 through 9 were previously "
                                 "merged from .*/A to the reintegrate source, "
                                 "but this is not the case:\n)"
                                 "|(  A_COPY\n)"
@@ -880,7 +881,7 @@ def merge_to_reverse_cherry_subtree_to_m
   #     svn:mergeinfo
   #       /A/B:2-4,6
   svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge', '--symmetric',
+  svntest.actions.run_and_verify_svn(None, None, [], 'merge',
                                      sbox.repo_url + '/A', A_COPY_path)
   svntest.actions.run_and_verify_svn(None, None, [], 'merge', '-c-5',
                                      sbox.repo_url + '/A/B',
@@ -902,11 +903,11 @@ def merge_to_reverse_cherry_subtree_to_m
   #   --- Eliding mergeinfo from 'A_COPY\B':
   #    U   A_COPY\B
   #
-  # But the --symmetric merge ignores the subtree mergeinfo and considers
+  # But the merge ignores the subtree mergeinfo and considers
   # only the mergeinfo on the target itself (and thus is a no-op but for
   # the mergeinfo change on the root of the merge target):
   #
-  #   >svn merge ^/A A_COPY --symmetric
+  #   >svn merge ^/A A_COPY
   #   --- Recording mergeinfo for merge of r7 into 'A_COPY':
   #    U   A_COPY
   #
@@ -984,7 +985,7 @@ def merge_to_reverse_cherry_subtree_to_m
                                        expected_status,
                                        expected_skip,
                                        None, None, None, None,
-                                       None, 1, 0, '--symmetric', A_COPY_path)
+                                       None, 1, 0, A_COPY_path)
 
 ########################################################################
 # Run the tests

Modified: subversion/branches/inheritable-props/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/subversion/tests/cmdline/merge_tests.py?rev=1371833&r1=1371832&r2=1371833&view=diff
==============================================================================
--- subversion/branches/inheritable-props/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/inheritable-props/subversion/tests/cmdline/merge_tests.py Fri Aug
10 22:30:18 2012
@@ -6541,7 +6541,7 @@ def avoid_reflected_revs(sbox):
   bfile2_content = "This is bfile2\n"
 
   # We'll consider A as the trunk and A_COPY as the feature branch
-  # Create a tfile1 in A
+  # r3 - Create a tfile1 in A
   svntest.main.file_write(tfile1_path, tfile1_content)
   svntest.actions.run_and_verify_svn(None, None, [], 'add', tfile1_path)
   expected_output = wc.State(wc_dir, {'A/tfile1' : Item(verb='Adding')})
@@ -6549,7 +6549,7 @@ def avoid_reflected_revs(sbox):
   svntest.actions.run_and_verify_commit(wc_dir, expected_output,
                                         wc_status, None, wc_dir)
 
-  # Create a bfile1 in A_COPY
+  # r4 - Create a bfile1 in A_COPY
   svntest.main.file_write(bfile1_path, bfile1_content)
   svntest.actions.run_and_verify_svn(None, None, [], 'add', bfile1_path)
   expected_output = wc.State(wc_dir, {'A_COPY/bfile1' : Item(verb='Adding')})
@@ -6557,7 +6557,7 @@ def avoid_reflected_revs(sbox):
   svntest.actions.run_and_verify_commit(wc_dir, expected_output,
                                         wc_status, None, wc_dir)
 
-  # Create one more file in A
+  # r5 - Create one more file in A
   svntest.main.file_write(tfile2_path, tfile2_content)
   svntest.actions.run_and_verify_svn(None, None, [], 'add', tfile2_path)
   expected_output = wc.State(wc_dir, {'A/tfile2' : Item(verb='Adding')})
@@ -6634,7 +6634,6 @@ def avoid_reflected_revs(sbox):
                                        None, A_COPY_path,
                                        '--allow-mixed-revisions')
 
-  # Sync up with the trunk ie., A
   svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
   expected_output = wc.State(wc_dir, {
     'A_COPY'        : Item(verb='Sending'),
@@ -6675,7 +6674,6 @@ def avoid_reflected_revs(sbox):
                                        None, A_COPY_path,
                                        '--allow-mixed-revisions')
 
-
   svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
   expected_output = wc.State(wc_dir, {
     'A_COPY'        : Item(verb='Sending'),
@@ -6684,7 +6682,7 @@ def avoid_reflected_revs(sbox):
   svntest.actions.run_and_verify_commit(wc_dir, expected_output,
                                         None, None, wc_dir)
 
-  # Add bfile2 to A_COPY
+  # r8 - Add bfile2 to A_COPY
   svntest.main.file_write(bfile2_path, bfile2_content)
   svntest.actions.run_and_verify_svn(None, None, [], 'add', bfile2_path)
   expected_output = wc.State(wc_dir, {'A_COPY/bfile2' : Item(verb='Adding')})
@@ -6700,7 +6698,6 @@ def avoid_reflected_revs(sbox):
 
   # Merge 2:8 from A_COPY(feature branch) to A(trunk).
   expected_output = wc.State(A_path, {
-    ''       : Item(status='C '),
     'bfile2' : Item(status='A '),
     'bfile1' : Item(status='A '),
     })
@@ -6710,7 +6707,7 @@ def avoid_reflected_revs(sbox):
   expected_elision_output = wc.State(A_path, {
     })
   expected_status = wc.State(A_path, {
-    ''          : Item(status='CM', wc_rev=6),
+    ''          : Item(status=' M', wc_rev=6),
     'bfile2'    : Item(status='A ', wc_rev='-', copied='+'),
     'bfile1'    : Item(status='A ', wc_rev='-', copied='+'),
     'tfile2'    : Item(status='  ', wc_rev=6),
@@ -11063,7 +11060,8 @@ def reverse_merge_away_all_mergeinfo(sbo
 # merge'.  Specifically see
 # http://subversion.tigris.org/issues/show_bug.cgi?id=3067#desc5
 @SkipUnless(server_has_mergeinfo)
-@Issues(3138,3067)
+@XFail()
+@Issues(3138,3067,4217)
 def dont_merge_revs_into_subtree_that_predate_it(sbox):
   "dont merge revs into a subtree that predate it"
 

Modified: subversion/branches/inheritable-props/subversion/tests/cmdline/prop_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/subversion/tests/cmdline/prop_tests.py?rev=1371833&r1=1371832&r2=1371833&view=diff
==============================================================================
--- subversion/branches/inheritable-props/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/branches/inheritable-props/subversion/tests/cmdline/prop_tests.py Fri Aug 10
22:30:18 2012
@@ -2268,7 +2268,7 @@ def propget_redirection(sbox):
 
   # Run propget -vR svn:mergeinfo, redirecting the stdout to a file.
   arglist = [svntest.main.svn_binary, 'propget', SVN_PROP_MERGEINFO, '-vR',
-             wc_dir]
+             '--config-dir', svntest.main.default_config_dir, wc_dir]
   redir_file = open(redirect_file, 'wb')
   pg_proc = subprocess.Popen(arglist, stdout=redir_file)
   pg_proc.wait()

Modified: subversion/branches/inheritable-props/tools/dev/svnraisetreeconflict/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/tools/dev/svnraisetreeconflict/main.c?rev=1371833&r1=1371832&r2=1371833&view=diff
==============================================================================
--- subversion/branches/inheritable-props/tools/dev/svnraisetreeconflict/main.c (original)
+++ subversion/branches/inheritable-props/tools/dev/svnraisetreeconflict/main.c Fri Aug 10
22:30:18 2012
@@ -67,8 +67,8 @@
 static svn_error_t *
 version(apr_pool_t *pool)
 {
-  return svn_opt_print_help3(NULL, "svnraisetreeconflict", TRUE, FALSE, NULL,
-                             NULL, NULL, NULL, NULL, NULL, pool);
+  return svn_opt_print_help4(NULL, "svnraisetreeconflict", TRUE, FALSE, FALSE,
+                             NULL, NULL, NULL, NULL, NULL, NULL, pool);
 }
 
 static void
@@ -308,8 +308,8 @@ check_lib_versions(void)
       { "svn_wc",     svn_wc_version },
       { NULL, NULL }
     };
-
   SVN_VERSION_DEFINE(my_version);
+
   return svn_ver_check_list(&my_version, checklist);
 }
 

Modified: subversion/branches/inheritable-props/tools/server-side/svn-rep-sharing-stats.c
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/tools/server-side/svn-rep-sharing-stats.c?rev=1371833&r1=1371832&r2=1371833&view=diff
==============================================================================
--- subversion/branches/inheritable-props/tools/server-side/svn-rep-sharing-stats.c (original)
+++ subversion/branches/inheritable-props/tools/server-side/svn-rep-sharing-stats.c Fri Aug
10 22:30:18 2012
@@ -42,8 +42,8 @@
 static svn_error_t *
 version(apr_pool_t *pool)
 {
-  return svn_opt_print_help3(NULL, "svn-rep-sharing-stats", TRUE, FALSE, NULL,
-                             NULL, NULL, NULL, NULL, NULL, pool);
+  return svn_opt_print_help4(NULL, "svn-rep-sharing-stats", TRUE, FALSE, FALSE,
+                             NULL, NULL, NULL, NULL, NULL, NULL, pool);
 }
 
 static void
@@ -91,8 +91,8 @@ check_lib_versions(void)
       { "svn_fs",     svn_fs_version },
       { NULL, NULL }
     };
-
   SVN_VERSION_DEFINE(my_version);
+
   return svn_error_trace(svn_ver_check_list(&my_version, checklist));
 }
 



Mime
View raw message