Mercurial > hg > evolve

changeset 635:0f5ff3b36144 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tutorial: update notes in unwritten section
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Wed, 02 Jan 2013 11:52:22 +0100
parents e763f7e94211
children 27c890b4f864
files tests/test-tutorial.t
diffstat 1 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-tutorial.t
+++ b/tests/test-tutorial.t
@@ -419,13 +419,12 @@
 Splitting change
 ------------------
 
-To be done (currently achieve with "two commit + debugobsolete")
+histedit or uncommit
 
 Collapsing change
 ------------------
 
-To be done (currently achieve with "revert + debugobsolete" or "rebase --collapse")
-
+This can be done with hg fold but the tutorial part is not written yet.
 
 
 
@@ -763,7 +762,7 @@
 Handling Conflicting amend
 ----------------------------------------------
 
-We can detect that multiple diverging//conflicting amend have been made. There
-will be a "evol-merge" command to merge conflicting amend
+We can detect that multiple diverging//conflicting amend have been made.
+hg evolve is able to solve several of them
 
-This command is not ready yet.
+This section need to be written