Mercurial > evolve
view tests/test-topic-shelve.t @ 3845:5c964ebe4d4b
evolve: always order the revs to be evolved
The current code only order the revs if we are resolving orphans and not in
other case. The ordering is important when we pass --all and tackle multiple
occurence of the same instability.
Let's order the revs for each instability. There are enough test coverage of
phase-divergence and content-divergence that I feel confident doing it because
none of the test changed.
The change in test-evolve-content-divergent.t demonstrates the indeed ordering
helped.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Tue, 12 Jun 2018 23:20:54 +0530 |
parents | 1bc4b0807c37 |
children | fb4801478d5d |
line wrap: on
line source
testing topic with shelve extension ------------------------------------ $ . "$TESTDIR/testlib/topic_setup.sh" $ hg init repo $ cd repo $ cat <<EOF >>.hg/hgrc > [extensions] > shelve= > EOF $ touch a $ echo "Hello" >> a $ hg topic "testing-shelve" marked working directory as topic: testing-shelve $ hg topic * testing-shelve (0 changesets) $ hg ci -m "First commit" -A adding a active topic 'testing-shelve' grew its first changeset (see 'hg help topics' for more information) $ hg topic * testing-shelve (1 changesets) $ echo " World" >> a $ hg stack ### topic: testing-shelve ### target: default (branch) t1@ First commit (current) shelve test ----------- $ hg shelve shelved as default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg topic * testing-shelve (1 changesets) $ hg stack ### topic: testing-shelve ### target: default (branch) t1@ First commit (current) unshelve test ------------- $ hg unshelve unshelving change 'default' $ hg topic * testing-shelve (1 changesets) $ hg stack ### topic: testing-shelve ### target: default (branch) t1@ First commit (current)