--- a/tests/test-sharing.t Thu Feb 04 10:24:26 2016 +0000
+++ b/tests/test-sharing.t Thu Feb 04 11:01:35 2016 +0000
@@ -46,6 +46,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ pull obsolescence markers
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Let's commit a preliminary change and push it to ``test-repo`` for
@@ -87,7 +88,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 2 new obsolescence markers
+ pull obsolescence markers
+ 2 obsolescence markers added
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Figure SG03
@@ -138,7 +140,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- 4 new obsolescence markers
+ pushing 4 obsolescence markers (36? bytes) (glob)
+ 4 obsolescence markers added
Now that the fix is public, we cannot amend it any more.
$ hg amend -m 'fix bug 37'
@@ -158,6 +161,8 @@
pushing to ../dev-repo
searching for changes
no changes found
+ pushing 4 obsolescence markers (36? bytes) (glob)
+ 0 obsolescence markers added
[1]
$ hg -R ../dev-repo shortlog -r 'draft()'
@@ -191,6 +196,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ pushing 4 obsolescence markers (36? bytes) (glob)
+ 0 obsolescence markers added
exporting bookmark bug15
$ hg -R ../review bookmarks
bug15 2:f91e97234c2b
@@ -206,7 +213,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 2 new obsolescence markers
+ pushing 6 obsolescence markers (55? bytes) (glob)
+ 2 obsolescence markers added
updating bookmark bug15
$ hg -R ../review bookmarks
bug15 3:cbdfbd5a5db2
@@ -233,6 +241,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ pushing 4 obsolescence markers (36? bytes) (glob)
+ 0 obsolescence markers added
exporting bookmark featureX
$ hg -R ../review bookmarks
bug15 3:cbdfbd5a5db2
@@ -249,7 +259,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 2 new obsolescence markers
+ pushing 6 obsolescence markers (55? bytes) (glob)
+ 2 obsolescence markers added
updating bookmark featureX
Bob receives second review, amends, and pushes to public:
@@ -263,7 +274,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- 4 new obsolescence markers
+ pushing 8 obsolescence markers (73? bytes) (glob)
+ 4 obsolescence markers added
$ hg -R ../public bookmarks
no bookmarks set
$ hg push ../review
@@ -274,7 +286,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 2 new obsolescence markers
+ pushing 8 obsolescence markers (73? bytes) (glob)
+ 2 obsolescence markers added
updating bookmark featureX
$ hg -R ../review bookmarks
bug15 3:cbdfbd5a5db2
@@ -344,7 +357,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 4 new obsolescence markers
+ pull obsolescence markers
+ 4 obsolescence markers added
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg log -G -q -r 'head()'
o 5:540ba8f317e6
@@ -374,7 +388,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- 3 new obsolescence markers
+ pushing 11 obsolescence markers (* bytes) (glob)
+ 3 obsolescence markers added
$ hg push ../review
pushing to ../review
searching for changes
@@ -382,7 +397,8 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files
- 1 new obsolescence markers
+ pushing 11 obsolescence markers (* bytes) (glob)
+ 1 obsolescence markers added
updating bookmark bug15
Figure SG08: review and public changesets after Alice pushes.
@@ -444,6 +460,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ pull obsolescence markers
+ 0 obsolescence markers added
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 'better fix (alice)' >> file1
$ hg amend -u alice -m 'fix bug 24 (v2 by alice)'
@@ -471,7 +489,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 2 new obsolescence markers
+ pull obsolescence markers
+ 2 obsolescence markers added
(run 'hg heads' to see heads, 'hg merge' to merge)
2 new divergent changesets