Mercurial > hgsubversion

diff tests/test_pull.py @ 812:8c7447b4b004

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 b64173a27ce8
children f28e0f54a6ef
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)