equal
deleted
inserted
replaced
86 adding changesets |
86 adding changesets |
87 adding manifests |
87 adding manifests |
88 adding file changes |
88 adding file changes |
89 added 1 changesets with 1 changes to 1 files (+1 heads) |
89 added 1 changesets with 1 changes to 1 files (+1 heads) |
90 2 new obsolescence markers |
90 2 new obsolescence markers |
91 obsoleted 1 changesets |
91 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
92 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
93 updated to "60ffde5765c5: fix bug 37" |
|
94 1 other heads for branch "default" |
92 1 other heads for branch "default" |
95 |
93 |
96 Figure SG03 |
94 Figure SG03 |
97 $ hg shortlog --hidden -G |
95 $ hg shortlog --hidden -G |
98 @ 2:60ffde5765c5 draft fix bug 37 |
96 @ 2:60ffde5765c5 draft fix bug 37 |
120 |
118 |
121 Figure SG04 (test-repo) |
119 Figure SG04 (test-repo) |
122 $ cd ../test-repo |
120 $ cd ../test-repo |
123 $ hg update |
121 $ hg update |
124 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
122 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
125 updated to "de6151c48e1c: fix bug 37" |
|
126 1 other heads for branch "default" |
123 1 other heads for branch "default" |
127 $ hg shortlog --hidden -G |
124 $ hg shortlog --hidden -G |
128 @ 4:de6151c48e1c draft fix bug 37 |
125 @ 4:de6151c48e1c draft fix bug 37 |
129 | |
126 | |
130 | x 3:60ffde5765c5 draft fix bug 37 |
127 | x 3:60ffde5765c5 draft fix bug 37 |
211 adding changesets |
208 adding changesets |
212 adding manifests |
209 adding manifests |
213 adding file changes |
210 adding file changes |
214 added 1 changesets with 1 changes to 1 files (+1 heads) |
211 added 1 changesets with 1 changes to 1 files (+1 heads) |
215 2 new obsolescence markers |
212 2 new obsolescence markers |
216 obsoleted 1 changesets |
|
217 updating bookmark bug15 |
213 updating bookmark bug15 |
218 $ hg -R ../review bookmarks |
214 $ hg -R ../review bookmarks |
219 bug15 3:cbdfbd5a5db2 |
215 bug15 3:cbdfbd5a5db2 |
220 |
216 |
221 Figure SG06: review repository after Alice pushes her amended changeset. |
217 Figure SG06: review repository after Alice pushes her amended changeset. |
256 adding changesets |
252 adding changesets |
257 adding manifests |
253 adding manifests |
258 adding file changes |
254 adding file changes |
259 added 1 changesets with 1 changes to 1 files (+1 heads) |
255 added 1 changesets with 1 changes to 1 files (+1 heads) |
260 2 new obsolescence markers |
256 2 new obsolescence markers |
261 obsoleted 1 changesets |
|
262 updating bookmark featureX |
257 updating bookmark featureX |
263 |
258 |
264 Bob receives second review, amends, and pushes to public: |
259 Bob receives second review, amends, and pushes to public: |
265 this time, he's sure he got it right! |
260 this time, he's sure he got it right! |
266 $ echo 'Do stuff.' > file1 |
261 $ echo 'Do stuff.' > file1 |
282 adding changesets |
277 adding changesets |
283 adding manifests |
278 adding manifests |
284 adding file changes |
279 adding file changes |
285 added 1 changesets with 1 changes to 1 files (+1 heads) |
280 added 1 changesets with 1 changes to 1 files (+1 heads) |
286 2 new obsolescence markers |
281 2 new obsolescence markers |
287 obsoleted 1 changesets |
|
288 updating bookmark featureX |
282 updating bookmark featureX |
289 $ hg -R ../review bookmarks |
283 $ hg -R ../review bookmarks |
290 bug15 3:cbdfbd5a5db2 |
284 bug15 3:cbdfbd5a5db2 |
291 featureX 6:540ba8f317e6 |
285 featureX 6:540ba8f317e6 |
292 |
286 |
398 adding changesets |
392 adding changesets |
399 adding manifests |
393 adding manifests |
400 adding file changes |
394 adding file changes |
401 added 1 changesets with 0 changes to 1 files |
395 added 1 changesets with 0 changes to 1 files |
402 1 new obsolescence markers |
396 1 new obsolescence markers |
403 obsoleted 1 changesets |
|
404 updating bookmark bug15 |
397 updating bookmark bug15 |
405 |
398 |
406 Figure SG08: review and public changesets after Alice pushes. |
399 Figure SG08: review and public changesets after Alice pushes. |
407 $ hg --hidden -R ../review shortlog -G -r 1:: |
400 $ hg --hidden -R ../review shortlog -G -r 1:: |
408 o 7:a06ec1bf97bd public fix bug 15 (v2) |
401 o 7:a06ec1bf97bd public fix bug 15 (v2) |