equal
deleted
inserted
replaced
1 .. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
1 .. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
2 .. Logilab SA <contact@logilab.fr> |
2 .. Logilab SA <contact@logilab.fr> |
3 |
3 |
4 ----------------------------------------------------------- |
4 ----------------------------------- |
5 Terminology of the obsolete concept |
5 Terminology of the obsolete concept |
6 ----------------------------------------------------------- |
6 ----------------------------------- |
7 |
7 |
8 Obsolete markers |
8 Obsolete markers |
9 --------------------------------- |
9 ---------------- |
10 |
10 |
11 The mutable concept is based on **obsolete markers**. Creating an obsolete |
11 The mutable concept is based on **obsolete markers**. Creating an obsolete |
12 marker registers a relation between an old obsoleted changeset and its newer |
12 marker registers a relation between an old obsoleted changeset and its newer |
13 version. |
13 version. |
14 |
14 |
52 |
52 |
53 .. note:: I'm not very happy with this naming scheme and I'm looking for a |
53 .. note:: I'm not very happy with this naming scheme and I'm looking for a |
54 better distinction between *direct successors* and **any successors**. |
54 better distinction between *direct successors* and **any successors**. |
55 |
55 |
56 Possible changesets "type" |
56 Possible changesets "type" |
57 --------------------------------- |
57 -------------------------- |
58 |
58 |
59 The following table describes names and behaviors of changesets affected by |
59 The following table describes names and behaviors of changesets affected by |
60 obsolete markers. The left column describes generic categories and the right |
60 obsolete markers. The left column describes generic categories and the right |
61 columns are about sub-categories. |
61 columns are about sub-categories. |
62 |
62 |
180 +------------------------------------------------------------------------------+ |
180 +------------------------------------------------------------------------------+ |
181 |
181 |
182 |
182 |
183 |
183 |
184 Command and operation name |
184 Command and operation name |
185 --------------------------------- |
185 -------------------------- |
186 |
186 |
187 |
187 |
188 Existing terms |
188 Existing terms |
189 `````````````` |
189 `````````````` |
190 |
190 |
194 :graft: to copy a changeset |
194 :graft: to copy a changeset |
195 :rebase: to move a changeset |
195 :rebase: to move a changeset |
196 |
196 |
197 |
197 |
198 Uncommit |
198 Uncommit |
199 ````````````` |
199 ```````` |
200 |
200 |
201 Remove files from a commit (and leave them as dirty in the working directory) |
201 Remove files from a commit (and leave them as dirty in the working directory) |
202 |
202 |
203 The *evolve* extension have an `uncommit` command that aims to replace most |
203 The *evolve* extension have an `uncommit` command that aims to replace most |
204 `rollback` usage. |
204 `rollback` usage. |
205 |
205 |
206 Fold |
206 Fold |
207 `````````` |
207 ```` |
208 |
208 |
209 Collapse multiple changesets into a unique one. |
209 Collapse multiple changesets into a unique one. |
210 |
210 |
211 The *evolve* extension will have a `fold` command. |
211 The *evolve* extension will have a `fold` command. |
212 |
212 |
213 Prune |
213 Prune |
214 `````````` |
214 ````` |
215 |
215 |
216 Make a changeset obsolete without successors. |
216 Make a changeset obsolete without successors. |
217 |
217 |
218 This an important operation as it should mostly replace *strip*. |
218 This an important operation as it should mostly replace *strip*. |
219 |
219 |
221 |
221 |
222 - kill: shall has funny effects when you forget "hg" in front of ``hg kill``. |
222 - kill: shall has funny effects when you forget "hg" in front of ``hg kill``. |
223 - obsolete: too vague, too long and too generic. |
223 - obsolete: too vague, too long and too generic. |
224 |
224 |
225 evolve |
225 evolve |
226 ``````````````` |
226 `````` |
227 |
227 |
228 Automatically resolve *troublesome* changesets |
228 Automatically resolve *troublesome* changesets |
229 (*unstable*, *bumped* and *divergent*) |
229 (*unstable*, *bumped* and *divergent*) |
230 |
230 |
231 This is an important name as hg pull/push will suggest it the same way it |
231 This is an important name as hg pull/push will suggest it the same way it |