Mercurial > hgsubversion
comparison tests/test_fetch_mappings.py @ 1489:9a6bb3657861
Merge with stable.
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Sun, 26 Jun 2016 21:10:36 -0400 |
| parents | a0ba38def79b 253b2ab253a1 |
| children | d55c9d0ba350 |
comparison
equal
deleted
inserted
replaced
| 1478:797c7b58a735 | 1489:9a6bb3657861 |
|---|---|
| 159 repo = self._loadwithfilemap('replace_trunk_with_branch.svndump', | 159 repo = self._loadwithfilemap('replace_trunk_with_branch.svndump', |
| 160 "exclude alpha\ninclude .\nexclude gamma\n") | 160 "exclude alpha\ninclude .\nexclude gamma\n") |
| 161 # The exclusion of alpha is overridden by the later rule to | 161 # The exclusion of alpha is overridden by the later rule to |
| 162 # include all of '.', whereas gamma should remain excluded | 162 # include all of '.', whereas gamma should remain excluded |
| 163 # because it's excluded after the root directory. | 163 # because it's excluded after the root directory. |
| 164 self.assertEqual(self.repo[0].manifest().keys(), | 164 self.assertEqual(sorted(self.repo[0].manifest().keys()), |
| 165 ['alpha', 'beta']) | 165 ['alpha', 'beta']) |
| 166 self.assertEqual(self.repo['default'].manifest().keys(), | 166 self.assertEqual(sorted(self.repo['default'].manifest().keys()), |
| 167 ['alpha', 'beta']) | 167 ['alpha', 'beta']) |
| 168 | 168 |
| 169 @test_util.requiresreplay | 169 @test_util.requiresreplay |
| 170 def test_file_map_copy(self): | 170 def test_file_map_copy(self): |
| 171 # Exercise excluding files copied from a non-excluded directory. | 171 # Exercise excluding files copied from a non-excluded directory. |