37 |
37 |
38 You can use the standard log command to display them. You can use the |
38 You can use the standard log command to display them. You can use the |
39 phase revset to display unfinished work only, and use templates to have |
39 phase revset to display unfinished work only, and use templates to have |
40 the same kind of compact that the output of qseries has. |
40 the same kind of compact that the output of qseries has. |
41 |
41 |
42 This will result in something like that:: |
42 This will result in something like:: |
43 |
43 |
44 [alias] |
44 [alias] |
45 wip = log -r 'not public()' --template='{rev}:{node|short} {desc|firstline}\n' |
45 wip = log -r 'not public()' --template='{rev}:{node|short} {desc|firstline}\n' |
46 |
46 |
47 hg qnew |
47 hg qnew |
48 ```````` |
48 ```````` |
49 |
49 |
50 With evolve you handle standard changesets without an additional overlay. |
50 With evolve you handle standard changesets without an additional overlay. |
51 |
51 |
52 Standard changeset are created using hg commit as usual.:: |
52 Standard changeset are created using hg commit as usual:: |
53 |
53 |
54 $ hg commit |
54 $ hg commit |
55 |
55 |
56 If you want to keep the "WIP is not pushed" behavior, you want to |
56 If you want to keep the "WIP is not pushed" behavior, you want to |
57 set your changeset in the secret phase using the phase command. |
57 set your changeset in the secret phase using the phase command. |
58 |
58 |
59 Note that you only need it for the first commit you want to be secret. Later |
59 Note that you only need it for the first commit you want to be secret. Later |
60 commits will inherit their parents phase. |
60 commits will inherit their parent's phase. |
61 |
61 |
62 If you always want your new commit to be in the secret phase, your should |
62 If you always want your new commit to be in the secret phase, your should |
63 consider updating your configuration: |
63 consider updating your configuration: |
64 |
64 |
65 [phases] |
65 [phases] |
90 .. note: refresh is an alias for amend |
90 .. note: refresh is an alias for amend |
91 |
91 |
92 hg qref --exclude |
92 hg qref --exclude |
93 ````````````````````` |
93 ````````````````````` |
94 |
94 |
95 To remove changes from you current commit use:: |
95 To remove changes from your current commit use:: |
96 |
96 |
97 $ hg uncommit not-ready.txt |
97 $ hg uncommit not-ready.txt |
98 |
98 |
99 |
99 |
100 hg qpop |
100 hg qpop |
101 ````````` |
101 ````````` |
102 |
102 |
103 The following command emulate the behavior of hg qpop: |
103 The following command emulates the behavior of hg qpop: |
104 |
104 |
105 $ hg gdown |
105 $ hg gdown |
106 |
106 |
107 If you need to go back to an arbitrary commit you can use: |
107 If you need to go back to an arbitrary commit you can use: |
108 |
108 |
109 $ hg update |
109 $ hg update |
110 |
110 |
111 .. note:: gdown and update allow movement with working directory changes applied |
111 .. note:: gdown and update allow movement with working directory |
112 and gracefully merge them. |
112 changes applied, and gracefully merge them. |
113 |
113 |
114 hg qpush |
114 hg qpush |
115 ```````` |
115 ```````` |
116 |
116 |
117 When you rewrite changesets, descendants of rewritten changesets are marked as |
117 When you rewrite changesets, descendants of rewritten changesets are marked as |
151 $ hg fold first::last |
151 $ hg fold first::last |
152 |
152 |
153 hg qdiff |
153 hg qdiff |
154 ````````` |
154 ````````` |
155 |
155 |
156 ``pdiff`` is an alias for `hg diff -r .^` it works as qdiff, but outside mq. |
156 ``pdiff`` is an alias for `hg diff -r .^` It works like qdiff, but outside MQ. |
157 |
157 |
158 |
158 |
159 |
159 |
160 hg qfinish and hg qimport |
160 hg qfinish and hg qimport |
161 ```````````````````````````` |
161 ```````````````````````````` |
162 |
162 |
163 These are not necessary anymore. If you want to control exchange and |
163 These are not necessary anymore. If you want to control the |
164 mutability of changesets, see the phase feature |
164 mutability of changesets, see the phase feature. |
165 |
165 |
166 |
166 |
167 |
167 |
168 hg qcommit |
168 hg qcommit |
169 ``````````````` |
169 ``````````````` |