Mercurial > hgsubversion
comparison tests/test_fetch_branches.py @ 1489:9a6bb3657861
Merge with stable.
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Sun, 26 Jun 2016 21:10:36 -0400 |
| parents | 253b2ab253a1 |
| children | d55c9d0ba350 |
comparison
equal
deleted
inserted
replaced
| 1478:797c7b58a735 | 1489:9a6bb3657861 |
|---|---|
| 39 repo = self._load_fixture_and_fetch('unrelatedbranch.svndump') | 39 repo = self._load_fixture_and_fetch('unrelatedbranch.svndump') |
| 40 heads = [repo[n] for n in repo.heads()] | 40 heads = [repo[n] for n in repo.heads()] |
| 41 heads = dict([(ctx.branch(), ctx) for ctx in heads]) | 41 heads = dict([(ctx.branch(), ctx) for ctx in heads]) |
| 42 # Let these tests disabled yet as the fix is not obvious | 42 # Let these tests disabled yet as the fix is not obvious |
| 43 self.assertEqual(heads['branch1'].manifest().keys(), ['b']) | 43 self.assertEqual(heads['branch1'].manifest().keys(), ['b']) |
| 44 self.assertEqual(heads['branch2'].manifest().keys(), ['a', 'b']) | 44 self.assertEqual(sorted(heads['branch2'].manifest().keys()), |
| 45 ['a', 'b']) | |
| 45 | 46 |
| 46 def test_unorderedbranch(self): | 47 def test_unorderedbranch(self): |
| 47 repo = self._load_fixture_and_fetch('unorderedbranch.svndump') | 48 repo = self._load_fixture_and_fetch('unorderedbranch.svndump') |
| 48 r = repo['branch'] | 49 r = repo['branch'] |
| 49 self.assertEqual(0, r.parents()[0].rev()) | 50 self.assertEqual(0, r.parents()[0].rev()) |
