Mercurial > hgsubversion
comparison tests/test_push_dirs.py @ 733:bfb88a304ebe
Merge
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Sun, 10 Oct 2010 10:22:37 -0500 |
| parents | de036c2cb36a |
| children | e9af7eba88db |
comparison
equal
deleted
inserted
replaced
| 732:050f03a3bdf5 | 733:bfb88a304ebe |
|---|---|
| 77 ] | 77 ] |
| 78 self.commitchanges(changes) | 78 self.commitchanges(changes) |
| 79 self.pushrevisions() | 79 self.pushrevisions() |
| 80 self.assertEqual(self.svnls('project/trunk'), ['a' ,]) | 80 self.assertEqual(self.svnls('project/trunk'), ['a' ,]) |
| 81 | 81 |
| 82 def test_push_single_dir_change_in_subdir(self): | |
| 83 # Tests simple pushing from default branch to a single dir repo | |
| 84 # Changes a file in a subdir (regression). | |
| 85 repo = self._load_fixture_and_fetch('branch_from_tag.svndump', | |
| 86 stupid=False, | |
| 87 layout='single', | |
| 88 subdir='tags') | |
| 89 changes = [('tag_r3/alpha', 'tag_r3/alpha', 'foo'), | |
| 90 ('tag_r3/new', 'tag_r3/new', 'foo'), | |
| 91 ('new_dir/new', 'new_dir/new', 'foo'), | |
| 92 ] | |
| 93 self.commitchanges(changes) | |
| 94 self.pushrevisions() | |
| 95 self.assertEqual(self.svnls('tags'), | |
| 96 ['copied_tag', | |
| 97 'copied_tag/alpha', | |
| 98 'copied_tag/beta', | |
| 99 'new_dir', | |
| 100 'new_dir/new', | |
| 101 'tag_r3', | |
| 102 'tag_r3/alpha', | |
| 103 'tag_r3/beta', | |
| 104 'tag_r3/new']) | |
| 82 | 105 |
| 83 def suite(): | 106 def suite(): |
| 84 all = [unittest.TestLoader().loadTestsFromTestCase(TestPushDirectories), | 107 all = [unittest.TestLoader().loadTestsFromTestCase(TestPushDirectories), |
| 85 ] | 108 ] |
| 86 return unittest.TestSuite(all) | 109 return unittest.TestSuite(all) |
