376 |
376 |
377 If REV is the parent of the working directory, then this new changeset |
377 If REV is the parent of the working directory, then this new changeset |
378 is committed automatically. Otherwise, hg needs to merge the |
378 is committed automatically. Otherwise, hg needs to merge the |
379 changes and the merged result is left uncommitted. |
379 changes and the merged result is left uncommitted. |
380 |
380 |
381 By default, the pending changeset will have one parent, |
381 .. container:: verbose |
382 maintaining a linear history. With --merge, the pending changeset |
382 |
383 will instead have two parents: the old parent of the working |
383 By default, the pending changeset will have one parent, |
384 directory and a new child of REV that simply undoes REV. |
384 maintaining a linear history. With --merge, the pending |
385 |
385 changeset will instead have two parents: the old parent of the |
386 Before version 1.7, the behavior without --merge was equivalent to |
386 working directory and a new child of REV that simply undoes REV. |
387 specifying --merge followed by :hg:`update --clean .` to cancel |
387 |
388 the merge and leave the child of REV as a head to be merged |
388 Before version 1.7, the behavior without --merge was equivalent |
389 separately. |
389 to specifying --merge followed by :hg:`update --clean .` to |
|
390 cancel the merge and leave the child of REV as a head to be |
|
391 merged separately. |
390 |
392 |
391 See :hg:`help dates` for a list of formats valid for -d/--date. |
393 See :hg:`help dates` for a list of formats valid for -d/--date. |
392 |
394 |
393 Returns 0 on success. |
395 Returns 0 on success. |
394 ''' |
396 ''' |