Mercurial > hg

comparison tests/test-backout.t @ 45760:e0ad11ab8052 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout: don't assume that tip as what we just committed Differential Revision: https://phab.mercurial-scm.org/D9256
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Wed, 28 Oct 2020 17:41:25 +0100
parents 693da1b928af
children 976b26bdd0d8
comparison
equal deleted inserted replaced
45759:ff48eea4a926 45760:e0ad11ab8052
804 --no-commit can't be used with --merge 804 --no-commit can't be used with --merge
805 805
806 $ hg backout --merge --no-commit 2 806 $ hg backout --merge --no-commit 2
807 abort: cannot specify both --no-commit and --merge 807 abort: cannot specify both --no-commit and --merge
808 [255] 808 [255]
809
810 Ensure that backout out the same changeset twice performs correctly:
811
812 $ hg backout 2
813 removing 3
814 changeset 3:8f188de730d9 backs out changeset 2:cccc23d9d68f
815 $ echo 4 > 4
816 $ hg ci -A -m 4
817 adding 4
818 $ hg up 2
819 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
820 $ hg backout 2
821 removing 3
822 created new head
823 changeset 3:8f188de730d9 backs out changeset 2:cccc23d9d68f