Mercurial > hgsubversion

diff tests/test_single_dir_push.py @ 1346:538bbb927609

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable.
author Augie Fackler <raf@durin42.com>
date Tue, 11 Aug 2015 17:07:59 -0400
parents e597714cb420
children 0ebcc5bbf692
line wrap: on
line diff
--- a/tests/test_single_dir_push.py
+++ b/tests/test_single_dir_push.py
@@ -158,7 +158,7 @@ class TestSingleDirPush(test_util.TestBa
         self.assertTrue('foo' in test_util.svnls(repo_path, ''))
         self.assertEqual(compathacks.branchset(repo), set(['default']))
         # Have to cross to another branch head, so hg.update doesn't work
-        commands.update(ui.ui(),
+        commands.update(self.ui(),
                         self.repo,
                         self.repo.branchheads('default')[1],
                         clean=True)
@@ -171,7 +171,7 @@ class TestSingleDirPush(test_util.TestBa
         # Tests pulling and pushing with a renamed branch
         # Based on test_push_single_dir
         repo_path = self.load_svndump('branch_from_tag.svndump')
-        cmd = ['clone', '--layout=single', '--branch=flaf']
+        cmd = ['clone', '--quiet', '--layout=single', '--branch=flaf']
         if self.stupid:
             cmd.append('--stupid')
         cmd += [test_util.fileurl(repo_path), self.wc_path]