--- a/tests/test-evolve.t Mon Jul 24 00:11:02 2017 +0200
+++ b/tests/test-evolve.t Mon Jul 24 04:41:31 2017 +0200
@@ -14,7 +14,6 @@
> git = 1
> unified = 0
> [extensions]
- > hgext.graphlog=
> EOF
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
$ mkcommit() {
@@ -31,7 +30,7 @@
> }
$ glog() {
- > hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@"
+ > hg log -G --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@"
> }
$ shaof() {
@@ -372,7 +371,7 @@
all solving bumped troubled
- $ hg glog
+ $ hg log -G
@ 8 feature-B: another feature that rox - test
|
| o 7 : another feature (child of ba0ec09b1bab) - test
@@ -387,7 +386,7 @@
computing new diff
committed as 6707c5e1c49d
working directory is now at 6707c5e1c49d
- $ hg glog
+ $ hg log -G
@ 9 feature-B: bumped update to 99833d22b0c6: - test
|
o 7 : another feature (child of ba0ec09b1bab) - test
@@ -446,7 +445,7 @@
atop:[14] dansk 2!
merging main-file-1
working directory is now at 68557e4f0048
- $ hg glog
+ $ hg log -G
@ 15 : dansk 3! - test
|
o 14 : dansk 2! - test
@@ -984,7 +983,7 @@
$ hg commit -m "add new file bumped" -o 11
$ hg phase --public --hidden 11
1 new bumped changesets
- $ hg glog
+ $ hg log -G
@ 12 : add new file bumped - test
|
| o 11 : a2 - test
@@ -1003,7 +1002,7 @@
Now we have a bumped and an unstable changeset, we solve the bumped first
normally the unstable changeset would be solve first
- $ hg glog
+ $ hg log -G
@ 12 : add new file bumped - test
|
| o 11 : a2 - test
@@ -1039,7 +1038,7 @@
$ hg up 14
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ printf "newline\nnewline\n" >> a
- $ hg glog
+ $ hg log -G
o 16 : add gh - test
|
| o 15 : add gg - test
@@ -1056,7 +1055,7 @@
$ hg amend
2 new unstable changesets
- $ hg glog
+ $ hg log -G
@ 18 : a3 - test
|
| o 16 : add gh - test
@@ -1089,7 +1088,7 @@
move:[16] add gh
atop:[18] a3
working directory is now at e02107f98737
- $ hg glog
+ $ hg log -G
@ 20 : add gh - test
|
| o 19 : add gg - test