# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1308141854 -7200
# Node ID 8c7447b4b004e4e91ab00137480182f879859940
# Parent  ccefff0c4f911edca6e243e4a66780dc0af302df
test_pull: commands.pull() no longer aborts when crossing branches

Introduced by hg.610873cf064a

diff --git a/tests/test_pull.py b/tests/test_pull.py
--- 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)