equal
deleted
inserted
replaced
383 added 1 changesets with 1 changes to 1 files (+1 heads) |
383 added 1 changesets with 1 changes to 1 files (+1 heads) |
384 updating bookmark bug15 |
384 updating bookmark bug15 |
385 |
385 |
386 Figure 6 shows the state of the ``review`` repository at this point. |
386 Figure 6 shows the state of the ``review`` repository at this point. |
387 |
387 |
388 [figure SG06: rev 2:fn1e is Alice's obsolete v1, rev 3:cbdf is her v2; both children of rev 1:de61] |
388 [figure SG06: rev 2:f91e is Alice's obsolete v1, rev 3:cbdf is her v2; both children of rev 1:de61] |
389 |
389 |
390 After a busy morning of bug fixing, Alice stops for lunch. Let's see |
390 After a busy morning of bug fixing, Alice stops for lunch. Let's see |
391 what Bob has been up to. |
391 what Bob has been up to. |
392 |
392 |
393 Example 4: Bob implements and publishes a new feature |
393 Example 4: Bob implements and publishes a new feature |
399 review. :: |
399 review. :: |
400 |
400 |
401 $ cd ../bob |
401 $ cd ../bob |
402 $ echo 'stuff' > file1 |
402 $ echo 'stuff' > file1 |
403 $ hg bookmark featureX |
403 $ hg bookmark featureX |
404 $ hg commit -u bob -m 'implement feature X (v1)' # rev 4:1636 |
404 $ hg commit -u bob -m 'implement feature X (v1)' # rev 4:1936 |
405 $ hg push -B featureX |
405 $ hg push -B featureX |
406 [...] |
406 [...] |
407 added 1 changesets with 1 changes to 1 files (+1 heads) |
407 added 1 changesets with 1 changes to 1 files (+1 heads) |
408 exporting bookmark featureX |
408 exporting bookmark featureX |
409 |
409 |
611 base: [4] fix bug 24 (v1) |
611 base: [4] fix bug 24 (v1) |
612 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
612 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
613 |
613 |
614 Figure 10 shows how Bob's repository looks now. |
614 Figure 10 shows how Bob's repository looks now. |
615 |
615 |
616 [figure SG10: only one visible head, 9:5ad6, successor to hidden 6:a360 and 7:e3f9] |
616 [figure SG10: only one visible head, 9:b149, successor to hidden 6:a360 and 7:e3f9] |
617 |
617 |
618 We carefully dodged a merge conflict by specifying a merge tool |
618 We carefully dodged a merge conflict by specifying a merge tool |
619 (``internal:other``) that will take Alice's changes over Bob's. (You |
619 (``internal:other``) that will take Alice's changes over Bob's. (You |
620 might wonder why Bob wouldn't prefer his own changes by using |
620 might wonder why Bob wouldn't prefer his own changes by using |
621 ``internal:local``. He's avoiding a `bug`_ in ``evolve`` that occurs |
621 ``internal:local``. He's avoiding a `bug`_ in ``evolve`` that occurs |