[PATCH 1 of 2 evolve-ext V2] test: add parent hash to commit message in test-evolve.t
Matt Harbison
matt_harbison at yahoo.com
Tue Aug 12 01:10:42 UTC 2014
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1407623788 14400
# Sat Aug 09 18:36:28 2014 -0400
# Node ID 66f4c5c52d970f145cd218ceed065c3fe096631d
# Parent d2fe19c818ea2e6a65e1fe99de699807270b49d4
test: add parent hash to commit message in test-evolve.t
This (slightly) reduces the changes to the test when hashes in the commit
message are evolved in the next commit.
diff --git a/tests/test-evolve.t b/tests/test-evolve.t
--- a/tests/test-evolve.t
+++ b/tests/test-evolve.t
@@ -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 568a468b60fc)"
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
@@ -251,27 +251,27 @@
|
| x 5:c296b79833d1 at default(draft) temporary amend commit for 568a468b60fc
| |
- | | o 4:207cbc4ea7fe at default(draft) another feature
+ | | o 4:6992c59c6b06 at default(draft) another feature (child of 568a468b60fc)
| |/
- | | x 3:5bb880fc0f12 at default(draft) temporary amend commit for 7b36850622b2
+ | | x 3:c97947cdc7a2 at default(draft) temporary amend commit for 73296a82292a
| | |
- | | x 2:7b36850622b2 at default(draft) another feature
+ | | x 2:73296a82292a at default(draft) another feature (child of 568a468b60fc)
| |/
| x 1:568a468b60fc at default(draft) a nifty feature
|/
@ 0:e55e0562ee93 at default(public) base
$ hg debugobsolete
- 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 207cbc4ea7fee30d18b3a25f534fe5db22c6071b 0 {'date': '* *', 'user': 'test'} (glob)
- 5bb880fc0f12dd61eee6de36f62b93fdbc3684b0 0 {'date': '* *', 'user': 'test'} (glob)
+ 73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 {'date': '* *', 'user': 'test'} (glob)
+ c97947cdc7a2a11cf78419f5c2c3dd3944ec79e8 0 {'date': '* *', 'user': 'test'} (glob)
568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 {'date': '* *', 'user': 'test'} (glob)
c296b79833d1d497f33144786174bf35e04e44a3 0 {'date': '* *', 'user': 'test'} (glob)
$ hg evolve
- move:[4] another feature
+ move:[4] another feature (child of 568a468b60fc)
atop:[6] a nifty feature
merging main-file-1
$ hg log
- 7 feature-B: another feature - test
+ 7 feature-B: another feature (child of 568a468b60fc) - test
6 feature-A: a nifty feature - test
0 : base - test
@@ -300,7 +300,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
|
@@ -308,13 +308,13 @@
$ hg evolve --any --traceback
recreate:[8] another feature that rox
- atop:[7] another feature
+ atop:[7] another feature (child of 568a468b60fc)
computing new diff
- committed as ca3b75e3e59b
+ committed as 8234cfce9af9
$ hg glog
- @ 9 feature-B: bumped update to abe98aeaaa35: - test
+ @ 9 feature-B: bumped update to 5b410c3ae5af: - test
|
- o 7 : another feature - test
+ o 7 : another feature (child of 568a468b60fc) - test
|
o 6 feature-A: a nifty feature - test
|
@@ -376,7 +376,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
|
@@ -743,11 +743,11 @@
2 changesets folded
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ glog
- @ 16:e6d8dace77a1 at default(draft) Folding with custom commit message
+ @ 16:d0aee199f74c at default(draft) Folding with custom commit message
|
- o 13:e9c952d5bc4b at default(draft) dansk!
+ o 13:b0258f43f9d0 at default(draft) dansk!
|
- o 7:abe98aeaaa35 at default(public) another feature
+ o 7:5b410c3ae5af at default(public) another feature (child of 568a468b60fc)
|
o 6:ba0ec09b1bab at default(public) a nifty feature
|
@@ -762,8 +762,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)
More information about the Mercurial-devel
mailing list