--- a/tests/test-userguide.t Wed Sep 27 16:24:44 2017 +0200
+++ b/tests/test-userguide.t Wed Sep 27 16:26:30 2017 +0200
@@ -42,10 +42,8 @@
(use --hidden to access hidden revisions; successor: 934359450037)
[255]
$ hg --hidden shortlog -G
- @ 3:934359450037 draft implement feature Y
+ @ 2: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
@@ -54,10 +52,8 @@
$ hg rollback -q
$ hg amend -u alice -d '2 0' -m 'implement feature Y'
$ hg --hidden shortlog -G
- @ 3:934359450037 draft implement feature Y
+ @ 2: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
@@ -70,11 +66,11 @@
working directory now at 934359450037
1 changesets pruned
$ hg parents --template '{rev}:{node|short} {desc|firstline}\n'
- 3:934359450037 implement feature Y
- $ hg --hidden shortlog -G -r 3:
- x 4:a3e0ef24aaf0 draft debug hack
+ 2:934359450037 implement feature Y
+ $ hg --hidden shortlog -G -r 934359450037:
+ x 3:a3e0ef24aaf0 draft debug hack
|
- @ 3:934359450037 draft implement feature Y
+ @ 2:934359450037 draft implement feature Y
|
~
@@ -85,16 +81,16 @@
$ hg uncommit file2.c
$ hg status
M file2.c
- $ hg --hidden shortlog -G -r 'descendants(3) - 4'
- @ 6:c8defeecf7a4 draft fix bug 234
+ $ hg --hidden shortlog -G -r 'descendants(934359450037) - a3e0ef24aaf0'
+ @ 5:c8defeecf7a4 draft fix bug 234
|
- | x 5:da4331967f5f draft fix bug 234
+ | x 4:da4331967f5f draft fix bug 234
|/
- o 3:934359450037 draft implement feature Y
+ o 2:934359450037 draft implement feature Y
|
~
$ hg parents --template '{rev}:{node|short} {desc|firstline}\n{files}\n'
- 6:c8defeecf7a4 fix bug 234
+ 5:c8defeecf7a4 fix bug 234
file1.c
$ hg revert --no-backup file2.c
@@ -105,32 +101,32 @@
$ hg commit -m 'step 2'
$ echo step3 >> file2.c
$ hg commit -m 'step 3'
- $ hg log --template '{rev}:{node|short} {desc|firstline}\n' -r 7::
- 7:05e61aab8294 step 1
- 8:be6d5bc8e4cc step 2
- 9:35f432d9f7c1 step 3
- $ hg fold -d '0 0' -m 'fix bug 64' --from -r 7::
+ $ hg log --template '{rev}:{node|short} {desc|firstline}\n' -r 05e61aab8294::
+ 6:05e61aab8294 step 1
+ 7:be6d5bc8e4cc step 2
+ 8: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 6::
- @ 10:171c6a79a27b draft fix bug 64
+ $ hg --hidden shortlog -G -r c8defeecf7a4::
+ @ 9:171c6a79a27b draft fix bug 64
|
- | x 9:35f432d9f7c1 draft step 3
+ | x 8:35f432d9f7c1 draft step 3
| |
- | x 8:be6d5bc8e4cc draft step 2
+ | x 7:be6d5bc8e4cc draft step 2
| |
- | x 7:05e61aab8294 draft step 1
+ | x 6:05e61aab8294 draft step 1
|/
- o 6:c8defeecf7a4 draft fix bug 234
+ o 5:c8defeecf7a4 draft fix bug 234
|
~
- $ hg --hidden log -q -r 'successors(7) | successors(8) | successors(9)'
- 10:171c6a79a27b
- $ hg --hidden log -q -r 'precursors(10)'
- 7:05e61aab8294
- 8:be6d5bc8e4cc
- 9:35f432d9f7c1
- $ hg diff -c 10 -U 0
+ $ hg --hidden log -q -r 'successors(05e61aab8294) | successors(be6d5bc8e4cc) | successors(35f432d9f7c1)'
+ 9:171c6a79a27b
+ $ hg --hidden log -q -r 'precursors(171c6a79a27b)'
+ 6:05e61aab8294
+ 7:be6d5bc8e4cc
+ 8: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
+++ b/file1.c Thu Jan 01 00:00:00 1970 +0000
@@ -150,50 +146,48 @@
$ hg commit -u bob -d '4 0' -m 'cleanup'
$ echo 'new feature' >> file1.c
$ hg commit -u bob -d '5 0' -m 'feature 23'
- $ hg --hidden shortlog -G -r 10::
- @ 13:dadcbba2d606 draft feature 23
+ $ hg --hidden shortlog -G -r 171c6a79a27b::
+ @ 12:dadcbba2d606 draft feature 23
|
- o 12:debd46bb29dc draft cleanup
+ o 11:debd46bb29dc draft cleanup
|
- o 11:3e1cb8f70c02 draft fix bug 17
+ o 10:3e1cb8f70c02 draft fix bug 17
|
- o 10:171c6a79a27b draft fix bug 64
+ o 9:171c6a79a27b draft fix bug 64
|
~
example 7: amend an older changeset (figures 6, 7)
- $ hg update -q 11
+ $ hg update -q -r 3e1cb8f70c02
$ echo 'fix fix fix fix' > file2.c
$ hg amend -u bob -d '6 0'
- 2 new unstable changesets
+ 2 new orphan changesets
$ hg shortlog -r 'obsolete()'
- 11:3e1cb8f70c02 draft fix bug 17
- $ hg shortlog -r 'unstable()'
- 12:debd46bb29dc draft cleanup
- 13:dadcbba2d606 draft feature 23
- $ hg --hidden shortlog -G -r 10::
- @ 15:395cbeda3a06 draft fix bug 17
+ 10:3e1cb8f70c02 draft fix bug 17
+ $ hg shortlog -r "orphan()"
+ 11:debd46bb29dc draft cleanup
+ 12:dadcbba2d606 draft feature 23
+ $ hg --hidden shortlog -G -r 171c6a79a27b::
+ @ 13:395cbeda3a06 draft fix bug 17
|
- | x 14:f7fab707e247 draft temporary amend commit for 3e1cb8f70c02
+ | o 12:dadcbba2d606 draft feature 23
+ | |
+ | o 11:debd46bb29dc draft cleanup
| |
- | | o 13:dadcbba2d606 draft feature 23
- | | |
- | | o 12:debd46bb29dc draft cleanup
- | |/
- | x 11:3e1cb8f70c02 draft fix bug 17
+ | x 10:3e1cb8f70c02 draft fix bug 17
|/
- o 10:171c6a79a27b draft fix bug 64
+ o 9:171c6a79a27b draft fix bug 64
|
~
$ hg evolve -q --all
- $ hg shortlog -G -r 10::
- @ 17:91b4b0f8b5c5 draft feature 23
+ $ hg shortlog -G -r 171c6a79a27b::
+ @ 15:91b4b0f8b5c5 draft feature 23
|
- o 16:fe8858bd9bc2 draft cleanup
+ o 14:fe8858bd9bc2 draft cleanup
|
- o 15:395cbeda3a06 draft fix bug 17
+ o 13:395cbeda3a06 draft fix bug 17
|
- o 10:171c6a79a27b draft fix bug 64
+ o 9:171c6a79a27b draft fix bug 64
|
~
@@ -204,38 +198,36 @@
$ hg commit -u carl -d '8 0' -m 'debug hack'
$ echo 'more useful' >> file1.c
$ hg commit -u carl -d '9 0' -m 'more work'
- $ hg shortlog -G -r 17::
- @ 20:ea8fafca914b draft more work
+ $ hg shortlog -G -r 91b4b0f8b5c5::
+ @ 18:ea8fafca914b draft more work
|
- o 19:b23d06b457a8 draft debug hack
+ o 17:b23d06b457a8 draft debug hack
|
- o 18:1f33e68b18b9 draft useful work
+ o 16:1f33e68b18b9 draft useful work
|
- o 17:91b4b0f8b5c5 draft feature 23
+ o 15:91b4b0f8b5c5 draft feature 23
|
~
example 8: prune an older changeset (figures 8, 9)
- $ hg prune 19
+ $ hg prune b23d06b457a8
1 changesets pruned
- 1 new unstable changesets
- $ hg --hidden shortlog -G -r 18::
- @ 20:ea8fafca914b draft more work
+ 1 new orphan changesets
+ $ hg --hidden shortlog -G -r b23d06b457a8::
+ @ 18:ea8fafca914b draft more work
|
- x 19:b23d06b457a8 draft debug hack
- |
- o 18:1f33e68b18b9 draft useful work
+ x 17:b23d06b457a8 draft debug hack
|
~
$ hg evolve -q --all --any
- $ hg --hidden shortlog -G -r 18::
- @ 21:4393e5877437 draft more work
+ $ hg --hidden shortlog -G -r 1f33e68b18b9::
+ @ 19:4393e5877437 draft more work
|
- | x 20:ea8fafca914b draft more work
+ | x 18:ea8fafca914b draft more work
| |
- | x 19:b23d06b457a8 draft debug hack
+ | x 17:b23d06b457a8 draft debug hack
|/
- o 18:1f33e68b18b9 draft useful work
+ o 16:1f33e68b18b9 draft useful work
|
~
@@ -246,35 +238,35 @@
$ hg commit -u dan -d '11 0' -m 'fix bug 53'
$ echo 'and this handles bug 67' >> file1.c
$ hg commit -u dan -d '12 0' -m 'fix bug 67'
- $ hg update 22
+ $ hg update -r f84357446753
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg shortlog -G -r 21::
- o 23:4db2428c8ae3 draft fix bug 67
+ $ hg shortlog -G -r 4393e5877437::
+ o 21:4db2428c8ae3 draft fix bug 67
|
- @ 22:f84357446753 draft fix bug 53
+ @ 20:f84357446753 draft fix bug 53
|
- o 21:4393e5877437 draft more work
+ o 19:4393e5877437 draft more work
|
~
$ hg uncommit file2.c
- 1 new unstable changesets
+ 1 new orphan changesets
$ hg status
M file2.c
$ hg revert file2.c
$ hg evolve --all --any
- move:[23] fix bug 67
- atop:[24] fix bug 53
+ move:[21] fix bug 67
+ atop:[22] fix bug 53
working directory is now at 0d972d6888e6
- $ hg --hidden shortlog -G -r 21::
- @ 25:0d972d6888e6 draft fix bug 67
+ $ hg --hidden shortlog -G -r 4393e5877437::
+ @ 23:0d972d6888e6 draft fix bug 67
|
- o 24:71bb83d674c5 draft fix bug 53
+ o 22:71bb83d674c5 draft fix bug 53
|
- | x 23:4db2428c8ae3 draft fix bug 67
+ | x 21:4db2428c8ae3 draft fix bug 67
| |
- | x 22:f84357446753 draft fix bug 53
+ | x 20:f84357446753 draft fix bug 53
|/
- o 21:4393e5877437 draft more work
+ o 19:4393e5877437 draft more work
|
~
$ rm file2.c.orig
@@ -286,48 +278,48 @@
$ hg commit -u dan -d '11 0' -m 'fix a bug'
$ echo 'new feature' >> file1.c
$ hg commit -u dan -d '12 0' -m 'new feature'
- $ hg update 26
+ $ hg update 5b31a1239ab9
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg --hidden shortlog -G -r 25::
- o 27:fbb3c6d50427 draft new feature
+ $ hg --hidden shortlog -G -r 0d972d6888e6::
+ o 25:fbb3c6d50427 draft new feature
|
- @ 26:5b31a1239ab9 draft fix a bug
+ @ 24:5b31a1239ab9 draft fix a bug
|
- o 25:0d972d6888e6 draft fix bug 67
+ o 23:0d972d6888e6 draft fix bug 67
|
~
$ hg uncommit file2.c
- 1 new unstable changesets
+ 1 new orphan changesets
$ hg status
M file2.c
$ hg commit -m 'useful tweak'
$ hg --hidden shortlog -G -r 0d972d6888e6::
- @ 29:51e0d8c0a922 draft useful tweak
+ @ 27:51e0d8c0a922 draft useful tweak
|
- o 28:2594e98553a9 draft fix a bug
+ o 26:2594e98553a9 draft fix a bug
|
- | o 27:fbb3c6d50427 draft new feature
+ | o 25:fbb3c6d50427 draft new feature
| |
- | x 26:5b31a1239ab9 draft fix a bug
+ | x 24:5b31a1239ab9 draft fix a bug
|/
- o 25:0d972d6888e6 draft fix bug 67
+ o 23:0d972d6888e6 draft fix bug 67
|
~
$ hg evolve --all --any
- move:[27] new feature
- atop:[28] fix a bug
+ move:[25] new feature
+ atop:[26] fix a bug
working directory is now at 166c1c368ab6
$ hg --hidden shortlog -G -r 0d972d6888e6::
- @ 30:166c1c368ab6 draft new feature
+ @ 28:166c1c368ab6 draft new feature
|
- | o 29:51e0d8c0a922 draft useful tweak
+ | o 27:51e0d8c0a922 draft useful tweak
|/
- o 28:2594e98553a9 draft fix a bug
+ o 26:2594e98553a9 draft fix a bug
|
- | x 27:fbb3c6d50427 draft new feature
+ | x 25:fbb3c6d50427 draft new feature
| |
- | x 26:5b31a1239ab9 draft fix a bug
+ | x 24:5b31a1239ab9 draft fix a bug
|/
- o 25:0d972d6888e6 draft fix bug 67
+ o 23:0d972d6888e6 draft fix bug 67
|
~