--- a/tests/test-sharing.t Wed Apr 08 01:17:01 2020 +0800
+++ b/tests/test-sharing.t Fri May 08 22:50:09 2020 +0800
@@ -520,12 +520,12 @@
with: [6] fix bug 24 (v2 by alice)
base: [4] fix bug 24 (v1)
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
- working directory is now at aa824ceedb8b
+ working directory is now at f92394e17e33
$ hg log -q -r 'contentdivergent()'
Figure SG10: Bob's repository after fixing divergence.
$ hg --hidden shortlog -G -r 3::
- @ 7:aa82 draft fix bug 24 (v2 by bob)
+ @ 7:f923 draft fix bug 24 (v2 by bob)
|
| x 6:e3a5 draft fix bug 24 (v2 by alice)
|/
@@ -536,7 +536,7 @@
o 3:dd15 public fix bug 15 (v2)
|
~
- $ hg --hidden shortlog -r 'predecessors(aa82)'
+ $ hg --hidden shortlog -r 'predecessors(.)'
5:541f draft fix bug 24 (v2 by bob)
6:e3a5 draft fix bug 24 (v2 by alice)
$ cat file1