Index: svnmerge_test.py
===================================================================
--- svnmerge_test.py	(revision 27356)
+++ svnmerge_test.py	(working copy)
@@ -856,17 +856,17 @@
     def testTrimmedAvailMerge(self):
         """Check that both avail and merge do not search for phantom revs too hard."""
         self.svnmerge("init")
-        self.svnmerge("avail -vv -r8-9", match=r"svn log.*-r8:9")
-        self.svnmerge("merge -F -vv -r8-9", match=r"svn log.*-r8:9")
-        self.svnmerge("avail -vv -r2", nonmatch=r"svn log")
+        self.svnmerge("avail -vv -r8-9", match=r"svn --non-interactive log.*-r8:9")
+        self.svnmerge("merge -F -vv -r8-9", match=r"svn --non-interactive log.*-r8:9")
+        self.svnmerge("avail -vv -r2", nonmatch=r"svn --non-interactive log")
         self.svnmerge("integrated", match=r"^3-6,8-9$")
 
     def testMergeRecordOnly(self):
         """Check that flagging revisions as manually merged works."""
         self.svnmerge("init")
-        self.svnmerge("avail -vv -r9", match=r"svn log.*-r9:9")
+        self.svnmerge("avail -vv -r9", match=r"svn --non-interactive log.*-r9:9")
         self.svnmerge("merge --record-only -F -vv -r9",
-                      nonmatch=r"svn merge -r 8:9")
+                      nonmatch=r"svn --non-interactive merge -r 8:9")
         self.svnmerge("avail -r9", match=r"\A$")
         self.svnmerge("integrated", match=r"^3-6,9$")
         self.svnmerge("integrated -r9", match=r"^9$")
@@ -910,7 +910,7 @@
         # since that point should still be available to merge from
         # trunk to test-branch:
         self.svnmerge("avail -vv --bidirectional", match=r"\n9-10,16$")
-        self.svnmerge("merge -vv --bidirectional", match=r"svn merge --force -r 15:16")
+        self.svnmerge("merge -vv --bidirectional", match=r"svn --non-interactive merge --force -r 15:16")
         p = self.getproperty()
         self.assertEqual("/trunk:1-16", p)
         self.svnmerge("integrated", match=r"^3-16$")
@@ -936,7 +936,7 @@
         # Now check reflected revision is excluded with --bidirectional flag.
         self.svnmerge("avail -vv --bidirectional", match=r"\n18$")
 
-        self.svnmerge("merge -vv --bidirectional", match=r"svn merge --force -r 17:18")
+        self.svnmerge("merge -vv --bidirectional", match=r"svn --non-interactive merge --force -r 17:18")
         p = self.getproperty()
         self.assertEqual("/branches/test-branch:1-18", p)
 
Index: svnmerge.py
===================================================================
--- svnmerge.py	(revision 27356)
+++ svnmerge.py	(working copy)
@@ -298,7 +298,7 @@
         password = " --password=" + password
     else:
         password = ""
-    cmd = opts["svn"] + " --non-interactive " + username + password + " " + s
+    cmd = opts["svn"] + " --non-interactive" + username + password + " " + s
     if show or opts["verbose"] >= 2:
         print cmd
     if pretend: