Mercurial > hg
comparison tests/test-copytrace-heuristics.t @ 38618:c829749e7639
shelve: directly handle the initial parent alignment
Shelve is currently sub-contracting some of its work to the rebase extension.
In order to make shelve more independent and flexible we would like shelve to
handle the parent alignment directly.
After this change, we no longer need to use rebase in shelve.
Differential Revision: https://phab.mercurial-scm.org/D3693
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Tue, 29 May 2018 00:30:50 +0200 |
parents | 4441705b7111 |
children | f785073f792c |
comparison
equal
deleted
inserted
replaced
38617:948691ea92a9 | 38618:c829749e7639 |
---|---|
581 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | 581 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 |
582 desc: initial | 582 desc: initial |
583 $ hg unshelve | 583 $ hg unshelve |
584 unshelving change 'default' | 584 unshelving change 'default' |
585 rebasing shelved changes | 585 rebasing shelved changes |
586 rebasing 2:45f63161acea "changes to: initial" (tip) | |
587 merging b and a to b | 586 merging b and a to b |
588 $ ls | 587 $ ls |
589 b | 588 b |
590 $ cat b | 589 $ cat b |
591 b | 590 b |