diff -r 3dd5a6f83f8b -r f5d472b7e800 tests/test-userguide.t --- a/tests/test-userguide.t Fri Oct 20 16:07:40 2017 +0200 +++ b/tests/test-userguide.t Fri Oct 20 19:32:18 2017 +0200 @@ -42,8 +42,10 @@ (use --hidden to access hidden revisions; successor: 934359450037) [255] $ hg --hidden shortlog -G - @ 2:934359450037 draft implement feature Y + @ 3:934359450037 draft implement feature Y | + | x 2:6c5f78d5d467 draft temporary amend commit for fe0ecd3bd2a4 + | | | x 1:fe0ecd3bd2a4 draft implement feature Y |/ o 0:08c4b6f4efc8 draft init @@ -52,8 +54,10 @@ $ hg rollback -q $ hg amend -u alice -d '2 0' -m 'implement feature Y' $ hg --hidden shortlog -G - @ 2:934359450037 draft implement feature Y + @ 3:934359450037 draft implement feature Y | + | x 2:6c5f78d5d467 draft temporary amend commit for fe0ecd3bd2a4 + | | | x 1:fe0ecd3bd2a4 draft implement feature Y |/ o 0:08c4b6f4efc8 draft init @@ -66,11 +70,11 @@ working directory now at 934359450037 1 changesets pruned $ hg parents --template '{rev}:{node|short} {desc|firstline}\n' - 2:934359450037 implement feature Y + 3:934359450037 implement feature Y $ hg --hidden shortlog -G -r 934359450037: - x 3:a3e0ef24aaf0 draft debug hack + x 4:a3e0ef24aaf0 draft debug hack | - @ 2:934359450037 draft implement feature Y + @ 3:934359450037 draft implement feature Y | ~ @@ -82,15 +86,15 @@ $ hg status M file2.c $ hg --hidden shortlog -G -r 'descendants(934359450037) - a3e0ef24aaf0' - @ 5:c8defeecf7a4 draft fix bug 234 + @ 6:c8defeecf7a4 draft fix bug 234 | - | x 4:da4331967f5f draft fix bug 234 + | x 5:da4331967f5f draft fix bug 234 |/ - o 2:934359450037 draft implement feature Y + o 3:934359450037 draft implement feature Y | ~ $ hg parents --template '{rev}:{node|short} {desc|firstline}\n{files}\n' - 5:c8defeecf7a4 fix bug 234 + 6:c8defeecf7a4 fix bug 234 file1.c $ hg revert --no-backup file2.c @@ -102,30 +106,30 @@ $ echo step3 >> file2.c $ hg commit -m 'step 3' $ hg log --template '{rev}:{node|short} {desc|firstline}\n' -r 05e61aab8294:: - 6:05e61aab8294 step 1 - 7:be6d5bc8e4cc step 2 - 8:35f432d9f7c1 step 3 + 7:05e61aab8294 step 1 + 8:be6d5bc8e4cc step 2 + 9:35f432d9f7c1 step 3 $ hg fold -d '0 0' -m 'fix bug 64' --from -r 05e61aab8294:: 3 changesets folded 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg --hidden shortlog -G -r c8defeecf7a4:: - @ 9:171c6a79a27b draft fix bug 64 + @ 10:171c6a79a27b draft fix bug 64 | - | x 8:35f432d9f7c1 draft step 3 + | x 9:35f432d9f7c1 draft step 3 | | - | x 7:be6d5bc8e4cc draft step 2 + | x 8:be6d5bc8e4cc draft step 2 | | - | x 6:05e61aab8294 draft step 1 + | x 7:05e61aab8294 draft step 1 |/ - o 5:c8defeecf7a4 draft fix bug 234 + o 6:c8defeecf7a4 draft fix bug 234 | ~ $ hg --hidden log -q -r 'successors(05e61aab8294) | successors(be6d5bc8e4cc) | successors(35f432d9f7c1)' - 9:171c6a79a27b + 10:171c6a79a27b $ hg --hidden log -q -r 'precursors(171c6a79a27b)' - 6:05e61aab8294 - 7:be6d5bc8e4cc - 8:35f432d9f7c1 + 7:05e61aab8294 + 8:be6d5bc8e4cc + 9:35f432d9f7c1 $ hg diff -c 171c6a79a27b -U 0 diff -r c8defeecf7a4 -r 171c6a79a27b file1.c --- a/file1.c Thu Jan 01 00:00:10 1970 +0000 @@ -147,13 +151,13 @@ $ echo 'new feature' >> file1.c $ hg commit -u bob -d '5 0' -m 'feature 23' $ hg --hidden shortlog -G -r 171c6a79a27b:: - @ 12:dadcbba2d606 draft feature 23 + @ 13:dadcbba2d606 draft feature 23 | - o 11:debd46bb29dc draft cleanup + o 12:debd46bb29dc draft cleanup | - o 10:3e1cb8f70c02 draft fix bug 17 + o 11:3e1cb8f70c02 draft fix bug 17 | - o 9:171c6a79a27b draft fix bug 64 + o 10:171c6a79a27b draft fix bug 64 | ~ @@ -163,31 +167,33 @@ $ hg amend -u bob -d '6 0' 2 new orphan changesets $ hg shortlog -r 'obsolete()' - 10:3e1cb8f70c02 draft fix bug 17 + 11:3e1cb8f70c02 draft fix bug 17 $ hg shortlog -r "orphan()" - 11:debd46bb29dc draft cleanup - 12:dadcbba2d606 draft feature 23 + 12:debd46bb29dc draft cleanup + 13:dadcbba2d606 draft feature 23 $ hg --hidden shortlog -G -r 171c6a79a27b:: - @ 13:395cbeda3a06 draft fix bug 17 + @ 15:395cbeda3a06 draft fix bug 17 | - | o 12:dadcbba2d606 draft feature 23 - | | - | o 11:debd46bb29dc draft cleanup + | x 14:f7fab707e247 draft temporary amend commit for 3e1cb8f70c02 | | - | x 10:3e1cb8f70c02 draft fix bug 17 + | | o 13:dadcbba2d606 draft feature 23 + | | | + | | o 12:debd46bb29dc draft cleanup + | |/ + | x 11:3e1cb8f70c02 draft fix bug 17 |/ - o 9:171c6a79a27b draft fix bug 64 + o 10:171c6a79a27b draft fix bug 64 | ~ $ hg evolve -q --all $ hg shortlog -G -r 171c6a79a27b:: - @ 15:91b4b0f8b5c5 draft feature 23 + @ 17:91b4b0f8b5c5 draft feature 23 | - o 14:fe8858bd9bc2 draft cleanup + o 16:fe8858bd9bc2 draft cleanup | - o 13:395cbeda3a06 draft fix bug 17 + o 15:395cbeda3a06 draft fix bug 17 | - o 9:171c6a79a27b draft fix bug 64 + o 10:171c6a79a27b draft fix bug 64 | ~ @@ -199,13 +205,13 @@ $ echo 'more useful' >> file1.c $ hg commit -u carl -d '9 0' -m 'more work' $ hg shortlog -G -r 91b4b0f8b5c5:: - @ 18:ea8fafca914b draft more work + @ 20:ea8fafca914b draft more work | - o 17:b23d06b457a8 draft debug hack + o 19:b23d06b457a8 draft debug hack | - o 16:1f33e68b18b9 draft useful work + o 18:1f33e68b18b9 draft useful work | - o 15:91b4b0f8b5c5 draft feature 23 + o 17:91b4b0f8b5c5 draft feature 23 | ~ @@ -214,20 +220,20 @@ 1 changesets pruned 1 new orphan changesets $ hg --hidden shortlog -G -r b23d06b457a8:: - @ 18:ea8fafca914b draft more work + @ 20:ea8fafca914b draft more work | - x 17:b23d06b457a8 draft debug hack + x 19:b23d06b457a8 draft debug hack | ~ $ hg evolve -q --all --any $ hg --hidden shortlog -G -r 1f33e68b18b9:: - @ 19:4393e5877437 draft more work + @ 21:4393e5877437 draft more work | - | x 18:ea8fafca914b draft more work + | x 20:ea8fafca914b draft more work | | - | x 17:b23d06b457a8 draft debug hack + | x 19:b23d06b457a8 draft debug hack |/ - o 16:1f33e68b18b9 draft useful work + o 18:1f33e68b18b9 draft useful work | ~ @@ -241,11 +247,11 @@ $ hg update -r f84357446753 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg shortlog -G -r 4393e5877437:: - o 21:4db2428c8ae3 draft fix bug 67 + o 23:4db2428c8ae3 draft fix bug 67 | - @ 20:f84357446753 draft fix bug 53 + @ 22:f84357446753 draft fix bug 53 | - o 19:4393e5877437 draft more work + o 21:4393e5877437 draft more work | ~ $ hg uncommit file2.c @@ -254,19 +260,19 @@ M file2.c $ hg revert file2.c $ hg evolve --all --any - move:[21] fix bug 67 - atop:[22] fix bug 53 + move:[23] fix bug 67 + atop:[24] fix bug 53 working directory is now at 0d972d6888e6 $ hg --hidden shortlog -G -r 4393e5877437:: - @ 23:0d972d6888e6 draft fix bug 67 + @ 25:0d972d6888e6 draft fix bug 67 | - o 22:71bb83d674c5 draft fix bug 53 + o 24:71bb83d674c5 draft fix bug 53 | - | x 21:4db2428c8ae3 draft fix bug 67 + | x 23:4db2428c8ae3 draft fix bug 67 | | - | x 20:f84357446753 draft fix bug 53 + | x 22:f84357446753 draft fix bug 53 |/ - o 19:4393e5877437 draft more work + o 21:4393e5877437 draft more work | ~ $ rm file2.c.orig @@ -281,11 +287,11 @@ $ hg update 5b31a1239ab9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg --hidden shortlog -G -r 0d972d6888e6:: - o 25:fbb3c6d50427 draft new feature + o 27:fbb3c6d50427 draft new feature | - @ 24:5b31a1239ab9 draft fix a bug + @ 26:5b31a1239ab9 draft fix a bug | - o 23:0d972d6888e6 draft fix bug 67 + o 25:0d972d6888e6 draft fix bug 67 | ~ $ hg uncommit file2.c @@ -294,32 +300,32 @@ M file2.c $ hg commit -m 'useful tweak' $ hg --hidden shortlog -G -r 0d972d6888e6:: - @ 27:51e0d8c0a922 draft useful tweak + @ 29:51e0d8c0a922 draft useful tweak | - o 26:2594e98553a9 draft fix a bug + o 28:2594e98553a9 draft fix a bug | - | o 25:fbb3c6d50427 draft new feature + | o 27:fbb3c6d50427 draft new feature | | - | x 24:5b31a1239ab9 draft fix a bug + | x 26:5b31a1239ab9 draft fix a bug |/ - o 23:0d972d6888e6 draft fix bug 67 + o 25:0d972d6888e6 draft fix bug 67 | ~ $ hg evolve --all --any - move:[25] new feature - atop:[26] fix a bug + move:[27] new feature + atop:[28] fix a bug working directory is now at 166c1c368ab6 $ hg --hidden shortlog -G -r 0d972d6888e6:: - @ 28:166c1c368ab6 draft new feature + @ 30:166c1c368ab6 draft new feature | - | o 27:51e0d8c0a922 draft useful tweak + | o 29:51e0d8c0a922 draft useful tweak |/ - o 26:2594e98553a9 draft fix a bug + o 28:2594e98553a9 draft fix a bug | - | x 25:fbb3c6d50427 draft new feature + | x 27:fbb3c6d50427 draft new feature | | - | x 24:5b31a1239ab9 draft fix a bug + | x 26:5b31a1239ab9 draft fix a bug |/ - o 23:0d972d6888e6 draft fix bug 67 + o 25:0d972d6888e6 draft fix bug 67 | ~