33 |
33 |
34 .. [#] (defined by the evolve extension for you) |
34 .. [#] (defined by the evolve extension for you) |
35 |
35 |
36 |
36 |
37 |
37 |
38 Move a changeset: ``graft`` |
38 Move a changeset: ``grab`` |
39 ------------------------------------------------------------ |
39 ------------------------------------------------------------ |
40 |
40 |
41 The graft command introduced in 2.0 allows you to "copy changes from other |
41 You can use ``hg grab <rev>`` to move a rev at your current location, making the |
42 branches onto the current branch". |
42 old version obsolete. |
43 |
43 |
44 The graft command has been altered to allow the creation of an |
44 .. note:: grab is an alias for ``hg rebase --dest . --rev $@; hg up <result>`` |
45 obsolete marker indicating both the result cset and its source |
45 |
46 (actually recording changeset movements). |
|
47 |
|
48 This is achieved using a new flag `-O` (or `old-obsolete`) [#]_. |
|
49 |
|
50 |
|
51 XXX example |
|
52 |
|
53 .. warning:: when using graft --continue after conflict resolution you **MUST** |
|
54 pass `-O` or `-o` flag again because they are not saved for now |
|
55 |
|
56 |
|
57 .. [#] add this `-O` to graft instead of a dedicated command is probably |
|
58 abusive. But this was very convenient for experimental purposes. |
|
59 This will likely change in non experimental release. |
|
60 |
46 |
61 Delete a changeset: ``prune`` |
47 Delete a changeset: ``prune`` |
62 ------------------------------------------------------------ |
48 ------------------------------------------------------------ |
63 |
49 |
64 A new ``prune`` command allows removing a changeset. |
50 A new ``prune`` command allows removing a changeset. |