205 '''reverse effect of earlier changeset |
205 '''reverse effect of earlier changeset |
206 |
206 |
207 Prepare a new changeset with the effect of REV undone in the |
207 Prepare a new changeset with the effect of REV undone in the |
208 current working directory. |
208 current working directory. |
209 |
209 |
210 If REV is the parent of the working directory, then this changeset |
210 If REV is the parent of the working directory, then this new changeset |
211 is committed automatically. Otherwise, hg needs to merge the |
211 is committed automatically. Otherwise, hg needs to merge the |
212 changes and the merged result is left uncommitted. |
212 changes and the merged result is left uncommitted. |
213 |
213 |
214 By default, the pending changeset will have one parent, |
214 By default, the pending changeset will have one parent, |
215 maintaining a linear history. With --merge, the pending changeset |
215 maintaining a linear history. With --merge, the pending changeset |
216 will instead have two parents: the old parent of the working |
216 will instead have two parents: the old parent of the working |
217 directory and a child of REV that simply undoes REV. |
217 directory and a new child of REV that simply undoes REV. |
218 |
218 |
219 Before version 1.7, the default behavior was equivalent to |
219 Before version 1.7, the behavior without --merge was equivalent to |
220 specifying --merge followed by :hg:`update --clean .` to cancel |
220 specifying --merge followed by :hg:`update --clean .` to cancel |
221 the merge and leave the child of REV as a head to be merged |
221 the merge and leave the child of REV as a head to be merged |
222 separately. |
222 separately. |
223 |
223 |
224 See :hg:`help dates` for a list of formats valid for -d/--date. |
224 See :hg:`help dates` for a list of formats valid for -d/--date. |