Direct commit to the 1.1.x branch (regression tests)

On 2004-11-03 21:19+0000, Philip Martin wrote:
>
> Don't disable the dry-run on the trunk, disable it only on the branch.
> Fix the issue number on both trunk and branch.
>
Ok, now the bureaucratic question, How should I do that?

a) Create a branch on the 1.1.x where I port for this one comment line and
   one test line fix, and get 3 +1 for it

b) Get 3x +1 via dev@

c) Just directly commit it (and break against HACKING)

I hope that someone else will say 'go for it' and I could proceed
with (b).

Br, Jani

Fix issue #1905's regression test.

* subversion/tests/clients/cmdline/merge_tests.py
    (merge_funny_chars_on_path): Fix doc string (wrong issue number),
      and don't run dry-run, its output differs between 1.1.x-branch
      and trunk.

Index: subversion/tests/clients/cmdline/merge_tests.py
===================================================================
--- subversion/tests/clients/cmdline/merge_tests.py (revision 11737)
+++ subversion/tests/clients/cmdline/merge_tests.py (working copy)
@@ -1942,7 +1942,7 @@
 #----------------------------------------------------------------------
 # A test for issue 1905
 def merge_funny_chars_on_path(sbox):
- "merge with funny characters (issue #1995)"
+ "merge with funny characters (issue #1905)"
 
   sbox.build()
   wc_dir = sbox.wc_dir
@@ -2053,7 +2053,7 @@
                                        expected_skip,
                                        None, None, None, None, None,
                                        0, # please check props
- 1) # and do a dry-run also)
+ 0) # don't do a dry-run)
 
   expected_output_dic = {}
   

-- 
Jani Averbach
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org