Mercurial > evolve
view tests/test-stabilize-result.t @ 346:f4302a2079f4
tests: update graphlog output after hg@2e13c1bd34dc
2e13c1bd34dc displays obsolete changesets as 'x' instead of 'o'.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Sun, 08 Jul 2012 19:02:36 +0200 |
parents | d68ccae92d52 |
children | cdcdedc532b7 |
line wrap: on
line source
$ cat >> $HGRCPATH <<EOF > [defaults] > amend=-d "0 0" > [extensions] > hgext.rebase= > hgext.graphlog= > EOF $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH $ glog() { > hg glog --template \ > '{rev}:{node|short}@{branch}({phase}) bk:[{bookmarks}] {desc|firstline}\n' "$@" > } Test stabilize removing the changeset being stabilized $ hg init empty $ cd empty $ echo a > a $ hg ci -Am adda a $ echo b > b $ hg ci -Am addb b $ echo a >> a $ hg ci -m changea $ hg bookmark changea $ hg up 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a >> a $ hg amend -m changea 1 new unstables changesets $ hg stabilize -v move:[2] changea atop:[4] changea hg rebase -Dr cce2c55b8965 -d 1447e1c4828d resolving manifests $ glog --hidden @ 4:1447e1c4828d@default(draft) bk:[changea] changea | | x 3:41ad4fe8c795@default(secret) bk:[] amends 102a90ea7b4a3361e4082ed620918c261189a36a | | | | x 2:cce2c55b8965@default(secret) bk:[] changea | |/ | x 1:102a90ea7b4a@default(secret) bk:[] addb |/ o 0:07f494440405@default(draft) bk:[] adda $ hg debugsuccessors 102a90ea7b4a 1447e1c4828d 41ad4fe8c795 1447e1c4828d cce2c55b8965 000000000000