equal
deleted
inserted
replaced
483 |
483 |
484 backout cannot be used to fix either an unwanted or |
484 backout cannot be used to fix either an unwanted or |
485 incorrect merge. |
485 incorrect merge. |
486 |
486 |
487 .. container:: verbose |
487 .. container:: verbose |
|
488 |
|
489 Examples: |
|
490 |
|
491 - Reverse the effect of the parent of the working directory. |
|
492 This backout will be committed immediately:: |
|
493 |
|
494 hg backout -r . |
|
495 |
|
496 - Reverse the effect of previous bad revision 23:: |
|
497 |
|
498 hg backout -r 23 |
|
499 hg commit -m "Backout revision 23" |
|
500 |
|
501 - Reverse the effect of previous bad revision 23 and |
|
502 commit the backout immediately:: |
|
503 |
|
504 hg backout -r 23 --commit |
488 |
505 |
489 By default, the pending changeset will have one parent, |
506 By default, the pending changeset will have one parent, |
490 maintaining a linear history. With --merge, the pending |
507 maintaining a linear history. With --merge, the pending |
491 changeset will instead have two parents: the old parent of the |
508 changeset will instead have two parents: the old parent of the |
492 working directory and a new child of REV that simply undoes REV. |
509 working directory and a new child of REV that simply undoes REV. |