author | Boris Feld <boris.feld@octobus.net> |
Fri, 16 Jun 2017 09:22:39 +0200 | |
changeset 2593 | ed977325cd2a |
parent 1654 | d1c5d80b2ace |
child 3599 | 5a796d753427 |
permissions | -rw-r--r-- |
519
9825c7da5b54
ensure all file have a copyright notice
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
517
diff
changeset
|
1 |
.. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
9825c7da5b54
ensure all file have a copyright notice
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
517
diff
changeset
|
2 |
.. Logilab SA <contact@logilab.fr> |
527
b81193ef3488
docs: add missing blank line after Copyright notice
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
519
diff
changeset
|
3 |
|
1287
6f2c1574eda8
docs: fix slightly unconventional .rst markup
Greg Ward <greg@gerg.ca>
parents:
655
diff
changeset
|
4 |
----------------------------------- |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
5 |
From MQ To Evolve, The Refugee Book |
1287
6f2c1574eda8
docs: fix slightly unconventional .rst markup
Greg Ward <greg@gerg.ca>
parents:
655
diff
changeset
|
6 |
----------------------------------- |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
7 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
8 |
Cheat sheet |
1287
6f2c1574eda8
docs: fix slightly unconventional .rst markup
Greg Ward <greg@gerg.ca>
parents:
655
diff
changeset
|
9 |
----------- |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
10 |
|
228
5a17c0d41a00
proof-read documentation and docstrings
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
227
diff
changeset
|
11 |
============================== ============================================ |
5a17c0d41a00
proof-read documentation and docstrings
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
227
diff
changeset
|
12 |
mq command new equivalent |
5a17c0d41a00
proof-read documentation and docstrings
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
227
diff
changeset
|
13 |
============================== ============================================ |
5a17c0d41a00
proof-read documentation and docstrings
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
227
diff
changeset
|
14 |
qseries ``log`` |
5a17c0d41a00
proof-read documentation and docstrings
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
227
diff
changeset
|
15 |
qnew ``commit`` |
5a17c0d41a00
proof-read documentation and docstrings
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
227
diff
changeset
|
16 |
qrefresh ``amend`` |
642
f8c75459e8bd
doc: updates mq refugee book
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
538
diff
changeset
|
17 |
qrefresh --exclude ``uncommit`` |
538
63fd2a62cec4
doc improvement
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
527
diff
changeset
|
18 |
qpop ``update`` or ``gdown`` |
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
377
diff
changeset
|
19 |
qpush ``update`` or ``gup`` sometimes ``evolve`` |
373
8c92f65e0dcc
doc: fix weird quote in from-mq.rst
Patrick Mezard <patrick@mezard.eu>
parents:
366
diff
changeset
|
20 |
qrm ``prune`` |
538
63fd2a62cec4
doc improvement
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
527
diff
changeset
|
21 |
qfold ``fold`` |
228
5a17c0d41a00
proof-read documentation and docstrings
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
227
diff
changeset
|
22 |
qdiff ``odiff`` |
642
f8c75459e8bd
doc: updates mq refugee book
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
538
diff
changeset
|
23 |
qrecord ``record`` |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
24 |
|
228
5a17c0d41a00
proof-read documentation and docstrings
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
227
diff
changeset
|
25 |
qfinish -- |
5a17c0d41a00
proof-read documentation and docstrings
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
227
diff
changeset
|
26 |
qimport -- |
232
adb7e29cb2bd
docs: proof-read and review
Benoit Allard <benoit@aeteurope.nl>
parents:
228
diff
changeset
|
27 |
============================== ============================================ |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
28 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
29 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
30 |
Replacement details |
1287
6f2c1574eda8
docs: fix slightly unconventional .rst markup
Greg Ward <greg@gerg.ca>
parents:
655
diff
changeset
|
31 |
------------------- |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
32 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
33 |
hg qseries |
1287
6f2c1574eda8
docs: fix slightly unconventional .rst markup
Greg Ward <greg@gerg.ca>
parents:
655
diff
changeset
|
34 |
`````````` |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
35 |
|
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
325
diff
changeset
|
36 |
All your work in progress is now in real changesets all the time. |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
37 |
|
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
325
diff
changeset
|
38 |
You can use the standard log command to display them. You can use the |
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
325
diff
changeset
|
39 |
phase revset to display unfinished work only, and use templates to have |
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
325
diff
changeset
|
40 |
the same kind of compact that the output of qseries has. |
228
5a17c0d41a00
proof-read documentation and docstrings
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
227
diff
changeset
|
41 |
|
655
dd5765ae91c3
doc: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents:
642
diff
changeset
|
42 |
This will result in something like:: |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
43 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
44 |
[alias] |
208
05d6e3e36980
docs: fix broken alias for qseries
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
182
diff
changeset
|
45 |
wip = log -r 'not public()' --template='{rev}:{node|short} {desc|firstline}\n' |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
46 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
47 |
hg qnew |
1287
6f2c1574eda8
docs: fix slightly unconventional .rst markup
Greg Ward <greg@gerg.ca>
parents:
655
diff
changeset
|
48 |
``````` |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
49 |
|
228
5a17c0d41a00
proof-read documentation and docstrings
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
227
diff
changeset
|
50 |
With evolve you handle standard changesets without an additional overlay. |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
51 |
|
655
dd5765ae91c3
doc: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents:
642
diff
changeset
|
52 |
Standard changeset are created using hg commit as usual:: |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
53 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
54 |
$ hg commit |
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
55 |
|
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
325
diff
changeset
|
56 |
If you want to keep the "WIP is not pushed" behavior, you want to |
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
325
diff
changeset
|
57 |
set your changeset in the secret phase using the phase command. |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
58 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
59 |
Note that you only need it for the first commit you want to be secret. Later |
655
dd5765ae91c3
doc: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents:
642
diff
changeset
|
60 |
commits will inherit their parent's phase. |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
61 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
62 |
If you always want your new commit to be in the secret phase, your should |
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
63 |
consider updating your configuration: |
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
64 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
65 |
[phases] |
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
66 |
new-commit=secret |
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
67 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
68 |
hg qref |
1287
6f2c1574eda8
docs: fix slightly unconventional .rst markup
Greg Ward <greg@gerg.ca>
parents:
655
diff
changeset
|
69 |
``````` |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
70 |
|
228
5a17c0d41a00
proof-read documentation and docstrings
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
227
diff
changeset
|
71 |
A new command from evolution will allow you to rewrite the changeset you are |
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
325
diff
changeset
|
72 |
currently on. Just call: |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
73 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
74 |
$ hg amend |
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
75 |
|
182
33b9cb1ce659
docs: polishing of from-mq.
Arne Babenhauserheide <bab@draketo.de>
parents:
161
diff
changeset
|
76 |
This command takes the same options as commit, plus the switch '-e' (--edit) |
33b9cb1ce659
docs: polishing of from-mq.
Arne Babenhauserheide <bab@draketo.de>
parents:
161
diff
changeset
|
77 |
to edit the commit message in an editor. |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
78 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
79 |
|
500
4387e62bd4f4
Doc: several update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
80 |
.. -c is very confusig |
4387e62bd4f4
Doc: several update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
81 |
.. |
517
0bc0c9edcb15
evolve: usual syntax/grammar errors/long lines cleanup
Patrick Mezard <patrick@mezard.eu>
parents:
500
diff
changeset
|
82 |
.. The amend command also has a -c switch which allows you to make an |
500
4387e62bd4f4
Doc: several update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
83 |
.. explicit amending commit before rewriting a changeset.:: |
4387e62bd4f4
Doc: several update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
84 |
.. |
4387e62bd4f4
Doc: several update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
85 |
.. $ hg record -m 'feature A' |
517
0bc0c9edcb15
evolve: usual syntax/grammar errors/long lines cleanup
Patrick Mezard <patrick@mezard.eu>
parents:
500
diff
changeset
|
86 |
.. # oups, I forgot some stuff |
500
4387e62bd4f4
Doc: several update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
87 |
.. $ hg record babar.py |
1654 | 88 |
.. $ hg amend -c .^ # .^ refer to "working directory parent, here 'feature A' |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
89 |
|
642
f8c75459e8bd
doc: updates mq refugee book
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
538
diff
changeset
|
90 |
.. note: refresh is an alias for amend |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
91 |
|
642
f8c75459e8bd
doc: updates mq refugee book
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
538
diff
changeset
|
92 |
hg qref --exclude |
1287
6f2c1574eda8
docs: fix slightly unconventional .rst markup
Greg Ward <greg@gerg.ca>
parents:
655
diff
changeset
|
93 |
````````````````` |
325
43a686709ded
doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
232
diff
changeset
|
94 |
|
655
dd5765ae91c3
doc: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents:
642
diff
changeset
|
95 |
To remove changes from your current commit use:: |
325
43a686709ded
doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
232
diff
changeset
|
96 |
|
43a686709ded
doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
232
diff
changeset
|
97 |
$ hg uncommit not-ready.txt |
43a686709ded
doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
232
diff
changeset
|
98 |
|
43a686709ded
doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
232
diff
changeset
|
99 |
|
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
100 |
hg qpop |
1287
6f2c1574eda8
docs: fix slightly unconventional .rst markup
Greg Ward <greg@gerg.ca>
parents:
655
diff
changeset
|
101 |
``````` |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
102 |
|
655
dd5765ae91c3
doc: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents:
642
diff
changeset
|
103 |
The following command emulates the behavior of hg qpop: |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
104 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
105 |
$ hg gdown |
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
106 |
|
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
325
diff
changeset
|
107 |
If you need to go back to an arbitrary commit you can use: |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
108 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
109 |
$ hg update |
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
110 |
|
655
dd5765ae91c3
doc: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents:
642
diff
changeset
|
111 |
.. note:: gdown and update allow movement with working directory |
dd5765ae91c3
doc: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents:
642
diff
changeset
|
112 |
changes applied, and gracefully merge them. |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
113 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
114 |
hg qpush |
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
115 |
```````` |
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
116 |
|
182
33b9cb1ce659
docs: polishing of from-mq.
Arne Babenhauserheide <bab@draketo.de>
parents:
161
diff
changeset
|
117 |
When you rewrite changesets, descendants of rewritten changesets are marked as |
642
f8c75459e8bd
doc: updates mq refugee book
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
538
diff
changeset
|
118 |
"unstable". You need to rewrite them on top of the new version of their |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
119 |
ancestor. |
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
120 |
|
642
f8c75459e8bd
doc: updates mq refugee book
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
538
diff
changeset
|
121 |
The evolution extension adds a command to rewrite "unstable" |
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
325
diff
changeset
|
122 |
changesets::: |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
123 |
|
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
377
diff
changeset
|
124 |
$ hg evolve |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
125 |
|
182
33b9cb1ce659
docs: polishing of from-mq.
Arne Babenhauserheide <bab@draketo.de>
parents:
161
diff
changeset
|
126 |
You can also decide to do it manually using:: |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
127 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
128 |
$ hg graft -O <old-version> |
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
129 |
|
182
33b9cb1ce659
docs: polishing of from-mq.
Arne Babenhauserheide <bab@draketo.de>
parents:
161
diff
changeset
|
130 |
or:: |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
131 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
132 |
$ hg rebase -r <revset for old version> -d . |
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
133 |
|
357
b398e9c2dbd1
doc: English proofreading
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
325
diff
changeset
|
134 |
note: using graft allows you to pick the changeset you want next as the --move |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
135 |
option of qpush do. |
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
136 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
137 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
138 |
hg qrm |
1287
6f2c1574eda8
docs: fix slightly unconventional .rst markup
Greg Ward <greg@gerg.ca>
parents:
655
diff
changeset
|
139 |
`````` |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
140 |
|
228
5a17c0d41a00
proof-read documentation and docstrings
Nicolas Chauvat <nicolas.chauvat@logilab.fr>
parents:
227
diff
changeset
|
141 |
evolution introduce a new command to mark a changeset as "not wanted anymore".:: |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
142 |
|
366 | 143 |
$ hg prune <revset> |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
144 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
145 |
hg qfold |
1287
6f2c1574eda8
docs: fix slightly unconventional .rst markup
Greg Ward <greg@gerg.ca>
parents:
655
diff
changeset
|
146 |
```````` |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
147 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
148 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
149 |
:: |
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
150 |
|
500
4387e62bd4f4
Doc: several update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
492
diff
changeset
|
151 |
$ hg fold first::last |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
152 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
153 |
hg qdiff |
1287
6f2c1574eda8
docs: fix slightly unconventional .rst markup
Greg Ward <greg@gerg.ca>
parents:
655
diff
changeset
|
154 |
```````` |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
155 |
|
655
dd5765ae91c3
doc: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents:
642
diff
changeset
|
156 |
``pdiff`` is an alias for `hg diff -r .^` It works like qdiff, but outside MQ. |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
157 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
158 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
159 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
160 |
hg qfinish and hg qimport |
1287
6f2c1574eda8
docs: fix slightly unconventional .rst markup
Greg Ward <greg@gerg.ca>
parents:
655
diff
changeset
|
161 |
````````````````````````` |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
162 |
|
655
dd5765ae91c3
doc: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents:
642
diff
changeset
|
163 |
These are not necessary anymore. If you want to control the |
dd5765ae91c3
doc: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents:
642
diff
changeset
|
164 |
mutability of changesets, see the phase feature. |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
165 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
166 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
167 |
|
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
168 |
hg qcommit |
1287
6f2c1574eda8
docs: fix slightly unconventional .rst markup
Greg Ward <greg@gerg.ca>
parents:
655
diff
changeset
|
169 |
`````````` |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
170 |
|
182
33b9cb1ce659
docs: polishing of from-mq.
Arne Babenhauserheide <bab@draketo.de>
parents:
161
diff
changeset
|
171 |
If you really need to send patches through versioned mq patches, you should |
161
4e3f25ba5401
More doc and index with sphynx
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
|
172 |
look at the qsync extension. |