Mercurial > hgsubversion
comparison tests/test_externals.py @ 1055:2d7398fffd0d
push: obsolete rather than rebase & strip when enabled
This requires a few changes to wrappers.push() to use obsolescence
rather than strip and to make the rebase -- which is non-destructive
with obsolete active -- to no longer keep the originals. Possible
future work involves no longer relying on rebase for non-outgoing
revisions, and simply leaving them in the troubled state.
We test this feature by adding setting obsolete_mode_tests to True in
classes that push changes.
author | Dan Villiom Podlaski Christiansen <dan@cabo.dk> |
---|---|
date | Fri, 09 Aug 2013 19:30:25 +0200 |
parents | d741f536f23a |
children | 7d82131e7801 |
comparison
equal
deleted
inserted
replaced
1054:131cb06dca76 | 1055:2d7398fffd0d |
---|---|
275 | 275 |
276 def test_mergeexternals_stupid(self): | 276 def test_mergeexternals_stupid(self): |
277 self.test_mergeexternals(True) | 277 self.test_mergeexternals(True) |
278 | 278 |
279 class TestPushExternals(test_util.TestBase): | 279 class TestPushExternals(test_util.TestBase): |
280 obsolete_mode_tests = True | |
281 | |
280 def test_push_externals(self, stupid=False): | 282 def test_push_externals(self, stupid=False): |
281 repo = self._load_fixture_and_fetch('pushexternals.svndump') | 283 repo = self._load_fixture_and_fetch('pushexternals.svndump') |
282 # Add a new reference on an existing and non-existing directory | 284 # Add a new reference on an existing and non-existing directory |
283 changes = [ | 285 changes = [ |
284 ('.hgsvnexternals', '.hgsvnexternals', | 286 ('.hgsvnexternals', '.hgsvnexternals', |