--- a/tests/test-evolve.t Tue Aug 12 19:09:53 2014 -0400
+++ b/tests/test-evolve.t Sat Aug 09 18:36:28 2014 -0400
@@ -193,13 +193,13 @@
It is therefore advisable to always set the bookmark before committing::
$ hg book feature-B
- $ hg commit --message "another feature"
+ $ hg commit --message "another feature (child of $(hg log -r . -T '{node|short}'))"
So here we are::
$ hg book
feature-A 1:568a468b60fc
- * feature-B 2:7b36850622b2
+ * feature-B 2:73296a82292a
Fix The Second Patch
@@ -222,7 +222,7 @@
changeset plus the updating changeset are hidden from view by default::
$ hg log
- 4 feature-B: another feature - test
+ 4 feature-B: another feature (child of 568a468b60fc) - test
1 feature-A: a nifty feature - test
0 : base - test
@@ -242,7 +242,7 @@
1 new unstable changesets
$ hg log
6 feature-A: a nifty feature - test
- 4 feature-B: another feature - test
+ 4 feature-B: another feature (child of 568a468b60fc) - test
1 : a nifty feature - test
0 : base - test
$ hg up -q 0
@@ -301,7 +301,7 @@
$ hg glog
@ 8 feature-B: another feature that rox - test
|
- | o 7 : another feature - test
+ | o 7 : another feature (child of 568a468b60fc) - test
|/
o 6 feature-A: a nifty feature - test
|
@@ -379,7 +379,7 @@
|
o 13 feature-B: dansk! - test
|
- o 7 : another feature - test
+ o 7 : another feature (child of 568a468b60fc) - test
|
o 6 feature-A: a nifty feature - test
|
@@ -747,11 +747,11 @@
2 changesets folded
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ glog
- @ 16:e6d8dace77a1@default(draft) Folding with custom commit message
+ @ 16:d0aee199f74c@default(draft) Folding with custom commit message
|
- o 13:e9c952d5bc4b@default(draft) dansk!
+ o 13:b0258f43f9d0@default(draft) dansk!
|
- o 7:abe98aeaaa35@default(public) another feature
+ o 7:5b410c3ae5af@default(public) another feature (child of 568a468b60fc)
|
o 6:ba0ec09b1bab@default(public) a nifty feature
|
@@ -766,8 +766,8 @@
2 changesets folded
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg qlog
- 17 - 2451d817c756 A longer
+ 17 - bf2fd466ccd4 A longer
commit message (draft)
- 7 - abe98aeaaa35 another feature (public)
+ 7 - 5b410c3ae5af another feature (child of 568a468b60fc) (public)
6 - ba0ec09b1bab a nifty feature (public)
0 - e55e0562ee93 base (public)