Anonymous avatar Anonymous committed 35c8c5e

doc: replace graft -O with grab

Comments (0)

Files changed (1)

docs/evolve-faq.rst

 
 
 
-Move a changeset: ``graft``
+Move a changeset: ``grab``
 ------------------------------------------------------------
 
-The graft command introduced in 2.0 allows you to "copy changes from other
-branches onto the current branch".
+You can use ``hg grab <rev>`` to move a rev at your current location, making the
+old version obsolete.
 
-The graft command has been altered to allow the creation of an
-obsolete marker indicating both the result cset and its source
-(actually recording changeset movements).
+.. note:: grab is an alias for ``hg rebase --dest . --rev $@; hg up <result>``
 
-This is achieved using a new flag `-O` (or `old-obsolete`) [#]_.
-
-
-XXX example
-
-.. warning:: when using graft --continue after conflict resolution you **MUST**
-             pass `-O` or `-o` flag again because they are not saved for now
-
-
-.. [#] add this `-O` to graft instead of a dedicated command is probably
-       abusive. But this was very convenient for experimental purposes.
-       This will likely change in non experimental release.
 
 Delete a changeset: ``prune``
 ------------------------------------------------------------
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.