Mercurial > hgsubversion

comparison 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
comparison
equal deleted inserted replaced
811:ccefff0c4f91 812:8c7447b4b004
40 def test_onerevision_divergent(self): 40 def test_onerevision_divergent(self):
41 repo = self._load_fixture_and_fetch('single_rev.svndump') 41 repo = self._load_fixture_and_fetch('single_rev.svndump')
42 self.commitchanges((('alpha', 'alpha', 'Changed another way'),)) 42 self.commitchanges((('alpha', 'alpha', 'Changed another way'),))
43 state = repo.parents() 43 state = repo.parents()
44 self._add_svn_rev({'trunk/alpha': 'Changed one way'}) 44 self._add_svn_rev({'trunk/alpha': 'Changed one way'})
45 self.assertRaises(hgutil.Abort, commands.pull, 45 try:
46 self.repo.ui, repo, update=True) 46 commands.pull(self.repo.ui, repo, update=True)
47 except hgutil.Abort:
48 # hg < 1.9 raised when crossing branches
49 pass
47 self.assertEqual(state, repo.parents()) 50 self.assertEqual(state, repo.parents())
48 self.assertTrue('tip' not in repo[None].tags()) 51 self.assertTrue('tip' not in repo[None].tags())
49 self.assertEqual(len(repo.heads()), 2) 52 self.assertEqual(len(repo.heads()), 2)
50 53
51 def suite(): 54 def suite():