Mercurial > hgsubversion
changeset 812:8c7447b4b004
test_pull: commands.pull() no longer aborts when crossing branches
Introduced by hg.610873cf064a
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 15 Jun 2011 14:44:14 +0200 |
parents | ccefff0c4f91 |
children | f07bfd66db13 |
files | tests/test_pull.py |
diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test_pull.py +++ b/tests/test_pull.py @@ -42,8 +42,11 @@ class TestPull(test_util.TestBase): self.commitchanges((('alpha', 'alpha', 'Changed another way'),)) state = repo.parents() self._add_svn_rev({'trunk/alpha': 'Changed one way'}) - self.assertRaises(hgutil.Abort, commands.pull, - self.repo.ui, repo, update=True) + try: + commands.pull(self.repo.ui, repo, update=True) + except hgutil.Abort: + # hg < 1.9 raised when crossing branches + pass self.assertEqual(state, repo.parents()) self.assertTrue('tip' not in repo[None].tags()) self.assertEqual(len(repo.heads()), 2)