Mercurial > evolve
view tests/test-touch.t @ 2919:5b514ab2ab4e
stack: properly order stack when gaps existing inside it
We transitively search for the next "stack" ancestors, of changeset in the stack
not based on other revision of the stack. This should help having a consistent
display when topic are interleaved.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 09 Sep 2017 22:32:50 +0530 |
parents | 4b934144ed11 |
children | 06844693bb21 |
line wrap: on
line source
$ cat >> $HGRCPATH <<EOF > [ui] > logtemplate={rev}:{node|short} {desc}\n > [defaults] > amend=-d "0 0" > [extensions] > hgext.rebase= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ hg init repo $ cd repo $ echo A > a $ hg add a $ hg commit -m a Basic usage $ hg log -G @ 0:e93df3427f45 a $ hg touch . $ hg log -G @ 1:[0-9a-f]{12} a (re) Revive usage $ echo A > b $ hg add b $ hg commit -m ab --amend $ hg up --hidden 1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (*) (glob) (use 'hg evolve' to update to its successor: *) (glob) $ hg log -G o 3:[0-9a-f]{12} ab (re) @ 1:[0-9a-f]{12} a (re) $ hg touch . [1] a reviving this changeset will create divergence unless you make a duplicate. (a)llow divergence or (d)uplicate the changeset? a 2 new content-divergent changesets $ hg log -G @ 4:[0-9a-f]{12} a (re) o 3:[0-9a-f]{12} ab (re) $ hg prune 3 1 changesets pruned Duplicate $ hg touch --duplicate . $ hg log -G @ 5:[0-9a-f]{12} a (re) o 4:[0-9a-f]{12} a (re) Multiple touch $ echo C > c $ hg add c $ hg commit -m c $ echo D > d $ hg add d $ hg commit -m d $ hg log -G @ 7:[0-9a-f]{12} d (re) | o 6:[0-9a-f]{12} c (re) | o 5:[0-9a-f]{12} a (re) o 4:[0-9a-f]{12} a (re) $ hg touch 6:7 $ hg log -G @ 9:[0-9a-f]{12} d (re) | o 8:[0-9a-f]{12} c (re) | o 5:[0-9a-f]{12} a (re) o 4:[0-9a-f]{12} a (re) check move data kept after rebase on touch: $ touch gna1 $ hg commit -Am gna1 adding gna1 $ hg mv gna1 gna2 $ hg commit -m move $ hg st -C --change=tip A gna2 gna1 R gna1 $ hg up .^ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg touch 1 new orphan changesets $ hg rebase -s 11 -d 12 rebasing 11:* "move" (glob) $ hg st -C --change=tip A gna2 gna1 R gna1 check that the --duplicate option does not create divergence $ hg touch --duplicate 11 --hidden 1 new orphan changesets check that reviving a changeset with no successor does not show the prompt $ hg prune 14 1 changesets pruned $ hg touch 14 --hidden 1 new orphan changesets