--- a/tests/test-sharing.t Wed Sep 13 15:13:51 2017 +0200
+++ b/tests/test-sharing.t Fri Sep 15 15:48:18 2017 +0200
@@ -69,10 +69,8 @@
Figure SG02
$ hg shortlog --hidden -G
- @ 3:60ffde5765c5 draft fix bug 37
+ @ 2:60ffde5765c5 draft fix bug 37
|
- | x 2:2a039763c0f4 draft temporary amend commit for f6490818a721
- | |
| x 1:f6490818a721 draft prelim change
|/
o 0:0dc9c9f6ab91 public create new project
@@ -87,7 +85,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 2 new obsolescence markers
+ 1 new obsolescence markers
obsoleted 1 changesets
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "60ffde5765c5: fix bug 37"
@@ -108,10 +106,8 @@
Figure SG04 (dev-repo)
$ hg shortlog --hidden -G
- @ 4:de6151c48e1c draft fix bug 37
+ @ 3:de6151c48e1c draft fix bug 37
|
- | x 3:ad19d3570adb draft temporary amend commit for 60ffde5765c5
- | |
| x 2:60ffde5765c5 draft fix bug 37
|/
| x 1:f6490818a721 draft prelim change
@@ -125,12 +121,10 @@
updated to "de6151c48e1c: fix bug 37"
1 other heads for branch "default"
$ hg shortlog --hidden -G
- @ 4:de6151c48e1c draft fix bug 37
+ @ 3:de6151c48e1c draft fix bug 37
|
- | x 3:60ffde5765c5 draft fix bug 37
+ | x 2:60ffde5765c5 draft fix bug 37
|/
- | x 2:2a039763c0f4 draft temporary amend commit for f6490818a721
- | |
| x 1:f6490818a721 draft prelim change
|/
o 0:0dc9c9f6ab91 public create new project
@@ -143,7 +137,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- 4 new obsolescence markers
+ 2 new obsolescence markers
Now that the fix is public, we cannot amend it any more.
$ hg amend -m 'fix bug 37'
@@ -159,7 +153,7 @@
Oops, still have draft changesets in dev-repo: push the phase change there.
$ hg -R ../dev-repo shortlog -r 'draft()'
- 4:de6151c48e1c draft fix bug 37
+ 3:de6151c48e1c draft fix bug 37
$ hg push ../dev-repo
pushing to ../dev-repo
searching for changes
@@ -212,7 +206,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 2 new obsolescence markers
+ 1 new obsolescence markers
obsoleted 1 changesets
updating bookmark bug15
$ hg -R ../review bookmarks
@@ -257,7 +251,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 2 new obsolescence markers
+ 1 new obsolescence markers
obsoleted 1 changesets
updating bookmark featureX
@@ -272,7 +266,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- 4 new obsolescence markers
+ 2 new obsolescence markers
$ hg -R ../public bookmarks
no bookmarks set
$ hg push ../review
@@ -283,7 +277,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 2 new obsolescence markers
+ 1 new obsolescence markers
obsoleted 1 changesets
updating bookmark featureX
$ hg -R ../review bookmarks
@@ -333,17 +327,15 @@
her change, so now she can publish it.
$ cd ../alice
$ hg --hidden shortlog -G -r 1::
- @ 4:cbdfbd5a5db2 draft fix bug 15 (v2)
+ @ 3:cbdfbd5a5db2 draft fix bug 15 (v2)
|
- | x 3:55dd95168a35 draft temporary amend commit for f91e97234c2b
- | |
| x 2:f91e97234c2b draft fix bug 15 (v1)
|/
o 1:de6151c48e1c public fix bug 37
|
~
$ hg outgoing -q ../public
- 4:cbdfbd5a5db2
+ 3:cbdfbd5a5db2
$ hg push ../public
pushing to ../public
searching for changes
@@ -358,22 +350,20 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 4 new obsolescence markers
+ 2 new obsolescence markers
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg log -G -q -r 'head()'
- o 5:540ba8f317e6
+ o 4:540ba8f317e6
|
~
- @ 4:cbdfbd5a5db2
+ @ 3:cbdfbd5a5db2
|
~
$ hg --hidden shortlog -G -r 1::
- o 5:540ba8f317e6 public implement feature X (v3)
+ o 4:540ba8f317e6 public implement feature X (v3)
|
- | @ 4:cbdfbd5a5db2 draft fix bug 15 (v2)
+ | @ 3:cbdfbd5a5db2 draft fix bug 15 (v2)
|/
- | x 3:55dd95168a35 draft temporary amend commit for f91e97234c2b
- | |
| x 2:f91e97234c2b draft fix bug 15 (v1)
|/
o 1:de6151c48e1c public fix bug 37
@@ -383,7 +373,7 @@
Alice rebases her draft changeset on top of Bob's public changeset and
publishes the result.
$ hg rebase -d 5
- rebasing 4:cbdfbd5a5db2 "fix bug 15 (v2)" (bug15)
+ rebasing 3:cbdfbd5a5db2 "fix bug 15 (v2)" (bug15)
$ hg push ../public
pushing to ../public
searching for changes
@@ -391,7 +381,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- 3 new obsolescence markers
+ 2 new obsolescence markers
$ hg push ../review
pushing to ../review
searching for changes
@@ -474,10 +464,8 @@
$ echo 'better fix (bob)' >> file1
$ hg amend -u bob -m 'fix bug 24 (v2 by bob)'
$ hg --hidden shortlog -G -r 3::
- @ 6:a360947f6faf draft fix bug 24 (v2 by bob)
+ @ 5:a360947f6faf draft fix bug 24 (v2 by bob)
|
- | x 5:3466c7f5a149 draft temporary amend commit for 2fe6c4bd32d0
- | |
| x 4:2fe6c4bd32d0 draft fix bug 24 (v1)
|/
o 3:a06ec1bf97bd public fix bug 15 (v2)
@@ -492,31 +480,29 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 2 new obsolescence markers
+ 1 new obsolescence markers
(run 'hg heads' to see heads, 'hg merge' to merge)
2 new content-divergent changesets
Figure SG09: multiple heads! divergence! oh my!
$ hg --hidden shortlog -G -r 3::
- o 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
+ o 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
|
- | @ 6:a360947f6faf draft fix bug 24 (v2 by bob)
+ | @ 5:a360947f6faf draft fix bug 24 (v2 by bob)
|/
- | x 5:3466c7f5a149 draft temporary amend commit for 2fe6c4bd32d0
- | |
| x 4:2fe6c4bd32d0 draft fix bug 24 (v1)
|/
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)
+ 5:a360947f6faf draft fix bug 24 (v2 by bob)
+ 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
Use evolve to fix the divergence.
$ HGMERGE=internal:other hg evolve --contentdivergent
- merge:[6] fix bug 24 (v2 by bob)
- with: [7] fix bug 24 (v2 by alice)
+ merge:[5] fix bug 24 (v2 by bob)
+ 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 5ad6037c046c
@@ -524,24 +510,20 @@
Figure SG10: Bob's repository after fixing divergence.
$ hg --hidden shortlog -G -r 3::
- @ 9:5ad6037c046c draft fix bug 24 (v2 by bob)
+ @ 7:5ad6037c046c draft fix bug 24 (v2 by bob)
|
- | x 8:bcfc9a755ac3 draft temporary amend commit for a360947f6faf
- | |
- +---x 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
- | |
- | x 6:a360947f6faf draft fix bug 24 (v2 by bob)
+ | x 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
|/
- | x 5:3466c7f5a149 draft temporary amend commit for 2fe6c4bd32d0
- | |
+ | x 5:a360947f6faf draft fix bug 24 (v2 by bob)
+ |/
| x 4:2fe6c4bd32d0 draft fix bug 24 (v1)
|/
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)
+ $ hg --hidden shortlog -r 'precursors(5ad6037c046c)'
+ 5:a360947f6faf draft fix bug 24 (v2 by bob)
+ 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
$ cat file1
Do stuff.
pretty good fix