subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1623773 - /subversion/trunk/subversion/tests/cmdline/basic_tests.py
Date Tue, 09 Sep 2014 11:47:39 GMT
Author: rhuijben
Date: Tue Sep  9 11:47:38 2014
New Revision: 1623773

URL: http://svn.apache.org/r1623773
Log:
* subversion/tests/cmdline/basic_tests.py
  (automatic_conflict_resolution):
     Revert accidental comment change in r1623760.

Found by: arfrever

Modified:
    subversion/trunk/subversion/tests/cmdline/basic_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1623773&r1=1623772&r2=1623773&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Tue Sep  9 11:47:38 2014
@@ -2183,7 +2183,7 @@ def automatic_conflict_resolution(sbox):
   wc_backup = sbox.add_wc_path('backup')
   svntest.actions.duplicate_dir(wc_dir, wc_backup)
 
-  # Make a couple of local mods to files which ndll be committed
+  # Make a couple of local mods to files which will be committed
   mu_path = sbox.ospath('A/mu')
   lambda_path = sbox.ospath('A/B/lambda')
   rho_path = sbox.ospath('A/D/G/rho')



Mime
View raw message