Author: pburba
Date: Mon Nov 5 15:31:54 2012
New Revision: 1405837
URL: http://svn.apache.org/viewvc?rev=1405837&view=rev
Log:
Fix some typos (apparently my brain thinks "inheritable" and my fingers
type "inheritabled").
* subversion/tests/cmdline/merge_tests.py
(merge_away_subtrees_noninheritable_ranges): Fix comment typo.
* subversion/tests/cmdline/mergeinfo_tests.py
(noninheritabled_mergeinfo_not_always_eligible): Rename test to...
(noninheritable_mergeinfo_not_always_eligible): ...this.
(test_list): Account for test name change.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tests.py
subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1405837&r1=1405836&r2=1405837&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Mon Nov 5
15:31:54 2012
@@ -7611,7 +7611,7 @@ def merge_away_subtrees_noninheritable_r
svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
# Merge r8 from A/D/H to A_COPY_D/H at depth empty. Since r8 affects only
- # A_COPY/D/H itself, the resulting mergeinfo is inheritabled. Commit this
+ # A_COPY/D/H itself, the resulting mergeinfo is inheritable. Commit this
# merge as r13.
expected_output = wc.State(H_COPY_2_path, {
'' : Item(status=' U'),
Modified: subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py?rev=1405837&r1=1405836&r2=1405837&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py Mon Nov 5
15:31:54 2012
@@ -720,8 +720,8 @@ def natural_history_is_not_eligible_nor_
# ranges as partially merged".
@Issue(4050)
@SkipUnless(server_has_mergeinfo)
-def noninheritabled_mergeinfo_not_always_eligible(sbox):
- "noninheritabled mergeinfo not always eligible"
+def noninheritable_mergeinfo_not_always_eligible(sbox):
+ "noninheritable mergeinfo not always eligible"
sbox.build()
wc_dir = sbox.wc_dir
@@ -779,7 +779,7 @@ test_list = [ None,
mergeinfo_on_pegged_wc_path,
wc_target_inherits_mergeinfo_from_repos,
natural_history_is_not_eligible_nor_merged,
- noninheritabled_mergeinfo_not_always_eligible,
+ noninheritable_mergeinfo_not_always_eligible,
]
if __name__ == '__main__':
