# HG changeset patch # User Jonathan Nieder # Date 1297480647 21600 # Node ID bbdd858e3229d5ced99ae97edee66264aff654cc # Parent 6c70ca0b7e0771e769afe27889603afff61b94ba backout: clarify which changesets are new in help text Plus another wording tweak ("default behavior -> "behavior without --merge"). Suggested by Kevin Bullock. diff -r 6c70ca0b7e07 -r bbdd858e3229 mercurial/commands.py --- a/mercurial/commands.py Fri Feb 25 11:39:19 2011 +0100 +++ b/mercurial/commands.py Fri Feb 11 21:17:27 2011 -0600 @@ -207,16 +207,16 @@ Prepare a new changeset with the effect of REV undone in the current working directory. - If REV is the parent of the working directory, then this changeset + If REV is the parent of the working directory, then this new changeset is committed automatically. Otherwise, hg needs to merge the changes and the merged result is left uncommitted. By default, the pending changeset will have one parent, maintaining a linear history. With --merge, the pending changeset will instead have two parents: the old parent of the working - directory and a child of REV that simply undoes REV. - - Before version 1.7, the default behavior was equivalent to + directory and a new child of REV that simply undoes REV. + + Before version 1.7, the behavior without --merge was equivalent to specifying --merge followed by :hg:`update --clean .` to cancel the merge and leave the child of REV as a head to be merged separately.