# HG changeset patch # User Patrick Mezard # Date 1340294432 -7200 # Node ID c3ff47e6bd362be98a71af3f7d98fbdfe018206a # Parent a5894bb979091dc637e641848448af6ef9b385d6 test-evolve: extend output and exhibit an amend bug The extended section shows the parent revision stabilizing itself on another revision, without --any. In theory, only descendants of the parent predecessors or of its descendants should be stabilized, and be stabilized in parent subtree. Unfortunately, stabilize implementation correctly picks the changesets to stabilize but not their target. This problem is aggravated by amend registering too many obsolete markers which prevents the stabilize selection heuristic to prune several changesets. diff -r a5894bb97909 -r c3ff47e6bd36 tests/test-evolve.t --- a/tests/test-evolve.t Thu Jun 21 17:33:02 2012 +0200 +++ b/tests/test-evolve.t Thu Jun 21 18:00:32 2012 +0200 @@ -23,6 +23,10 @@ > hg ci -m "add $1" > } + $ glog() { + > hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@" + > } + various init $ hg init local @@ -211,6 +215,28 @@ 0 : base - test $ hg up -q 1 Working directory parent is obsolete + $ glog --hidden + o 6:23409eba69a0@default(draft) a nifty feature + | + | o 5:e416e48b2742@default(secret) french looks better + | | + | | o 4:f8111a076f09@default(draft) another feature + | |/ + | | o 3:524e478d4811@default(secret) fix spelling of Zwei + | | | + | | o 2:7b36850622b2@default(secret) another feature + | |/ + | @ 1:568a468b60fc@default(draft) a nifty feature + |/ + o 0:e55e0562ee93@default(draft) base + + $ hg debugsuccessors + 524e478d4811 f8111a076f09 + 568a468b60fc 23409eba69a0 + 568a468b60fc e416e48b2742 + 7b36850622b2 524e478d4811 + 7b36850622b2 f8111a076f09 + e416e48b2742 23409eba69a0 $ hg stabilize move:[4] another feature atop:[6] a nifty feature