--- a/tests/test-sharing.t Thu Apr 14 03:42:48 2016 +0000
+++ b/tests/test-sharing.t Thu Apr 14 13:02:23 2016 -0700
@@ -221,6 +221,7 @@
|/
@ 1:de6151c48e1c public fix bug 37
|
+ ~
Bob commits a draft changeset, pushes to review repo.
$ cd ../bob
@@ -296,11 +297,13 @@
|/
@ 1:de6151c48e1c public fix bug 37
|
+ ~
$ hg --hidden -R ../public shortlog -G -r 1::
o 2:540ba8f317e6 public implement feature X (v3)
|
o 1:de6151c48e1c public fix bug 37
|
+ ~
How do things look in the review repo?
$ cd ../review
@@ -317,6 +320,7 @@
|/
@ 1:de6151c48e1c public fix bug 37
|
+ ~
Meantime, Alice is back from lunch. While she was away, Bob approved
her change, so now she can publish it.
@@ -330,6 +334,7 @@
|/
o 1:de6151c48e1c public fix bug 37
|
+ ~
$ hg outgoing -q ../public
4:cbdfbd5a5db2
$ hg push ../public
@@ -351,8 +356,10 @@
$ hg log -G -q -r 'head()'
o 5:540ba8f317e6
|
- | @ 4:cbdfbd5a5db2
- |/
+ ~
+ @ 4:cbdfbd5a5db2
+ |
+ ~
$ hg --hidden shortlog -G -r 1::
o 5:540ba8f317e6 public implement feature X (v3)
|
@@ -364,6 +371,7 @@
|/
o 1:de6151c48e1c public fix bug 37
|
+ ~
Alice rebases her draft changeset on top of Bob's public changeset and
publishes the result.
@@ -403,6 +411,7 @@
|/
@ 1:de6151c48e1c public fix bug 37
|
+ ~
$ hg --hidden -R ../public shortlog -G -r 1::
o 3:a06ec1bf97bd public fix bug 15 (v2)
|
@@ -410,6 +419,7 @@
|
o 1:de6151c48e1c public fix bug 37
|
+ ~
$ cd ..
Setup for "cowboy mode" shared mutable history (to illustrate divergent
@@ -464,6 +474,7 @@
|/
o 3:a06ec1bf97bd public fix bug 15 (v2)
|
+ ~
Bob discovers the divergence.
$ hg pull ../alice
@@ -489,6 +500,7 @@
|/
o 3:a06ec1bf97bd public fix bug 15 (v2)
|
+ ~
$ hg --hidden shortlog -r 'successors(2fe6)'
6:a360947f6faf draft fix bug 24 (v2 by bob)
7:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
@@ -518,6 +530,7 @@
|/
o 3:a06ec1bf97bd public fix bug 15 (v2)
|
+ ~
$ hg --hidden shortlog -r 'precursors(9)'
6:a360947f6faf draft fix bug 24 (v2 by bob)
7:e3f99ce9d9cd draft fix bug 24 (v2 by alice)