equal
deleted
inserted
replaced
5 |
5 |
6 |
6 |
7 After having written some code for ticket #42, M W. start a patch (this |
7 After having written some code for ticket #42, M W. start a patch (this |
8 will be kind of like a 'work-in-progress' checkpoint initially):: |
8 will be kind of like a 'work-in-progress' checkpoint initially):: |
9 |
9 |
10 $ ci -m '[entities] remove magic' |
10 $ hg ci -m '[entities] remove magic' |
11 |
11 |
12 Instant patch ! Note how the default phase of this changeset is (still) |
12 Instant patch ! Note how the default phase of this changeset is (still) |
13 in "draft" state. |
13 in "draft" state. |
14 |
14 |
15 This is easily checkable:: |
15 This is easily checkable:: |
25 In practice, pushing to a "publishing" repository can also turn draft |
25 In practice, pushing to a "publishing" repository can also turn draft |
26 changesets into public ones. Older mercurial releases are automatically |
26 changesets into public ones. Older mercurial releases are automatically |
27 "publishing" since they do not have the notion of non-public changesets |
27 "publishing" since they do not have the notion of non-public changesets |
28 (or mutable history). |
28 (or mutable history). |
29 |
29 |
30 In the transition ... phase from older mercurial servers, this will |
30 During the transition from older mercurial servers to new ones, this will |
31 happen often, so be careful. |
31 happen often, so be careful. |
32 |
32 |
33 Now let's come back to our patch. Next hour sees good progress and W. |
33 Now let's come back to our patch. Next hour sees good progress and W. |
34 wants to complete the patch with the recent stuff (all that's shown by |
34 wants to complete the patch with the recent stuff (all that's shown by |
35 an "hg diff") to share with a co-worker (let's call him C.W.):: |
35 an "hg diff") to share with a co-worker (let's call him C.W.):: |
42 Before leaving, let's push to the central shared repository. That will |
42 Before leaving, let's push to the central shared repository. That will |
43 give C.W. the signal that something is ripe for review / further amendments:: |
43 give C.W. the signal that something is ripe for review / further amendments:: |
44 |
44 |
45 $ hg push # was done with a modern mercurial, draft phase is preserved |
45 $ hg push # was done with a modern mercurial, draft phase is preserved |
46 |
46 |
47 The next day, Mr C.W, which arrives very very early, can immediately |
47 The next day, Mr C.W., who arrives very early, can immediately |
48 work out some glitches in the patch. |
48 work out some glitches in the patch. |
49 |
49 |
50 He then starts another one, for ticket #43 and finally commits it. |
50 He then starts another one, for ticket #43 and finally commits it. |
51 Then, as original worker arrives, he pushes his stuff. |
51 Then, as original worker arrives, he pushes his stuff. |
52 |
52 |