subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1140630 - in /subversion/trunk/subversion: svn/notify.c tests/cmdline/upgrade_tests.py
Date Tue, 28 Jun 2011 14:08:37 GMT
Author: rhuijben
Date: Tue Jun 28 14:08:37 2011
New Revision: 1140630

URL: http://svn.apache.org/viewvc?rev=1140630&view=rev
Log:
Remove the final dot from "Upgraded" notifications to match the style used by
"Skipped" in the same report.
(We didn't see the skipped notifications before r1140506)

* subversion/svn/notify.c
  (notify): Remove '.'.

* subversion/tests/cmdline/upgrade_tests.py
  (dirs_only_upgrade,
   upgrade_with_missing_subdir): Update expected output.

Modified:
    subversion/trunk/subversion/svn/notify.c
    subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

Modified: subversion/trunk/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=1140630&r1=1140629&r2=1140630&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Tue Jun 28 14:08:37 2011
@@ -949,7 +949,7 @@ notify(void *baton, const svn_wc_notify_
       break;
 
     case svn_wc_notify_upgraded_path:
-        err = svn_cmdline_printf(pool, _("Upgraded '%s'.\n"), path_local);
+        err = svn_cmdline_printf(pool, _("Upgraded '%s'\n"), path_local);
         if (err)
           goto print_error;
       break;

Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1140630&r1=1140629&r2=1140630&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Tue Jun 28 14:08:37 2011
@@ -725,8 +725,8 @@ def dirs_only_upgrade(sbox):
 
   replace_sbox_with_tarfile(sbox, 'dirs-only.tar.bz2')
 
-  expected_output = ["Upgraded '%s'.\n" % (sbox.ospath('').rstrip(os.path.sep)),
-                     "Upgraded '%s'.\n" % (sbox.ospath('A'))]
+  expected_output = ["Upgraded '%s'\n" % (sbox.ospath('').rstrip(os.path.sep)),
+                     "Upgraded '%s'\n" % (sbox.ospath('A'))]
 
   svntest.actions.run_and_verify_svn(None, expected_output, [],
                                      'upgrade', sbox.wc_dir)
@@ -1063,13 +1063,13 @@ def upgrade_with_missing_subdir(sbox):
 
   # Now upgrade the working copy and expect a missing subdir
   expected_output = [
-    "Upgraded '%s'.\n" % sbox.wc_dir,
-    "Upgraded '%s'.\n" % sbox.ospath('A'),
+    "Upgraded '%s'\n" % sbox.wc_dir,
+    "Upgraded '%s'\n" % sbox.ospath('A'),
     "Skipped '%s'\n" % sbox.ospath('A/B'),
-    "Upgraded '%s'.\n" % sbox.ospath('A/C'),
-    "Upgraded '%s'.\n" % sbox.ospath('A/D'),
-    "Upgraded '%s'.\n" % sbox.ospath('A/D/G'),
-    "Upgraded '%s'.\n" % sbox.ospath('A/D/H'),
+    "Upgraded '%s'\n" % sbox.ospath('A/C'),
+    "Upgraded '%s'\n" % sbox.ospath('A/D'),
+    "Upgraded '%s'\n" % sbox.ospath('A/D/G'),
+    "Upgraded '%s'\n" % sbox.ospath('A/D/H'),
   ]
   svntest.actions.run_and_verify_svn(None, expected_output, [],
                                      'upgrade', sbox.wc_dir)



Mime
View raw message