Mercurial > hgsubversion
comparison tests/test_single_dir_push.py @ 1342:c6b01fd34694 stable
trying to fix progress output
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Wed, 08 Jul 2015 19:45:04 -0400 |
parents | f1dd304be8aa |
children | e597714cb420 |
comparison
equal
deleted
inserted
replaced
1339:74e82a7da393 | 1342:c6b01fd34694 |
---|---|
156 self.pushrevisions() | 156 self.pushrevisions() |
157 repo = self.repo # repo is outdated after the rebase happens, refresh | 157 repo = self.repo # repo is outdated after the rebase happens, refresh |
158 self.assertTrue('foo' in test_util.svnls(repo_path, '')) | 158 self.assertTrue('foo' in test_util.svnls(repo_path, '')) |
159 self.assertEqual(compathacks.branchset(repo), set(['default'])) | 159 self.assertEqual(compathacks.branchset(repo), set(['default'])) |
160 # Have to cross to another branch head, so hg.update doesn't work | 160 # Have to cross to another branch head, so hg.update doesn't work |
161 commands.update(ui.ui(), | 161 commands.update(self.ui(), |
162 self.repo, | 162 self.repo, |
163 self.repo.branchheads('default')[1], | 163 self.repo.branchheads('default')[1], |
164 clean=True) | 164 clean=True) |
165 self.pushrevisions() | 165 self.pushrevisions() |
166 self.assertTrue('default' in test_util.svnls(repo_path, '')) | 166 self.assertTrue('default' in test_util.svnls(repo_path, '')) |