Mercurial > hgsubversion
comparison tests/test_fetch_command.py @ 218:a360ddc97719
branches: change handling again, but this time a little less magic.
This change means that files located in the actual branches directory will now be wholly
ignored. If we want to handle those correctly, it will take a reasonably large amount of work
and probably a configuration flag. Also, any non-related paths outside of branches/trunk will
be explicitly ignored, which is similar to the somewhat accidental pre-branch-refactor
behavior. Finally, any unrelated files located as children of branches will cause the directory
in branches to be used as the branch - not, as recently was the case, the directory immediately
containing that file.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Sat, 28 Mar 2009 16:38:57 -0500 |
parents | b5ef9a404f5d |
children | c90cfa665b81 |
comparison
equal
deleted
inserted
replaced
217:6eb691a163cd | 218:a360ddc97719 |
---|---|
83 def test_file_mixed_with_branches(self): | 83 def test_file_mixed_with_branches(self): |
84 repo = self._load_fixture_and_fetch('file_mixed_with_branches.svndump') | 84 repo = self._load_fixture_and_fetch('file_mixed_with_branches.svndump') |
85 self.assertEqual(node.hex(repo['default'].node()), | 85 self.assertEqual(node.hex(repo['default'].node()), |
86 '434ed487136c1b47c1e8f952edb4dc5a8e6328df') | 86 '434ed487136c1b47c1e8f952edb4dc5a8e6328df') |
87 assert 'README' not in repo | 87 assert 'README' not in repo |
88 self.assertEqual(repo['tip'].branch(), | 88 assert '../branches' not in repo |
89 '../branches') | |
90 | |
91 | 89 |
92 def test_files_copied_from_outside_btt(self): | 90 def test_files_copied_from_outside_btt(self): |
93 repo = self._load_fixture_and_fetch( | 91 repo = self._load_fixture_and_fetch( |
94 'test_files_copied_from_outside_btt.svndump') | 92 'test_files_copied_from_outside_btt.svndump') |
95 self.assertEqual(node.hex(repo['tip'].node()), | 93 self.assertEqual(node.hex(repo['tip'].node()), |
96 '3c78170e30ddd35f2c32faa0d8646ab75bba4f73') | 94 '3c78170e30ddd35f2c32faa0d8646ab75bba4f73') |
97 self.assertEqual(len(repo.changelog), 3) | 95 self.assertEqual(len(repo.changelog), 2) |
98 | 96 |
99 def test_file_renamed_in_from_outside_btt(self): | 97 def test_file_renamed_in_from_outside_btt(self): |
100 repo = self._load_fixture_and_fetch( | 98 repo = self._load_fixture_and_fetch( |
101 'file_renamed_in_from_outside_btt.svndump') | 99 'file_renamed_in_from_outside_btt.svndump') |
102 self.assert_('LICENSE.file' in repo['default']) | 100 self.assert_('LICENSE.file' in repo['default']) |