Re: svn 1.1.x r11726: FAIL (i686-pc-linux-gnu shared ra_svn bdb)

On 2004-11-03 04:35+0100, brane@xbc.nu wrote:
>
> FAIL: merge_tests.py 16: merge with funny characters (issue #1995)
>

This patch fixes that failure. Do we like to apply it only to the
1.1.x branch or also for trunk? The dry run works just fine on trunk.

Br, Jani

Fix issue #1905's regression test (fix is actually for 1.1.x branch).

* 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