Mercurial > evolve
view tests/test-topic-shelve.t @ 3278:e4c0332ecee4 stable
topics: fix `hg stack` in case of split
This patch fixes the behaviour of hg stack which throws an error in some cases
when there are multiple successors. The case of divergence is not handled yet.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 11 Dec 2017 23:47:25 +0530 |
parents | f43a310c4338 |
children | 1bc4b0807c37 |
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 $ 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)