Mercurial > hgsubversion
changeset 1341:7e10891666fe
Merge with stable.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Thu, 09 Jul 2015 12:38:46 -0400 (2015-07-09) |
parents | db9d85618d3d (current diff) 74e82a7da393 (diff) |
children | 538bbb927609 |
files | |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test_pull.py +++ b/tests/test_pull.py @@ -30,7 +30,7 @@ class TestPull(test_util.TestBase): self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed'}) commands.pull(self.repo.ui, repo) self.assertEqual(state, repo.parents()) - self.assertTrue('tip' not in repo[None].tags()) + self.assertTrue('tip' not in repo['.'].tags()) def test_onerevision_doupdate(self): repo, repo_path = self._loadupdate('single_rev.svndump') @@ -38,7 +38,7 @@ class TestPull(test_util.TestBase): self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed'}) commands.pull(self.repo.ui, repo, update=True) self.failIfEqual(state, repo.parents()) - self.assertTrue('tip' in repo[None].tags()) + self.assertTrue('tip' in repo['.'].tags()) def test_onerevision_divergent(self): repo, repo_path = self._loadupdate('single_rev.svndump') @@ -51,7 +51,7 @@ class TestPull(test_util.TestBase): # hg < 1.9 raised when crossing branches pass self.assertEqual(state, repo.parents()) - self.assertTrue('tip' not in repo[None].tags()) + self.assertTrue('tip' not in repo['.'].tags()) self.assertEqual(len(repo.heads()), 2) def test_tag_repull_doesnt_happen(self):