$ hg init basic

  $ cd basic

should complain

  $ hg backout

  abort: please specify a revision to backout

  [255]

  $ hg backout -r 0 0

  abort: please specify just one revision

  [255]

basic operation

(this also tests that editor is invoked if the commit message is not

specified explicitly)

  $ echo a > a

  $ hg commit -d '0 0' -A -m a

  adding a

  $ echo b >> a

  $ hg commit -d '1 0' -m b

  $ hg status --rev tip --rev "tip^1"

  M a

  $ HGEDITOR=cat hg backout -d '2 0' tip --tool=true

  reverting a

  Backed out changeset a820f4f40a57

  HG: Enter commit message.  Lines beginning with 'HG:' are removed.

  HG: Leave message empty to abort commit.

  HG: --

  HG: user: test

  HG: branch 'default'

  HG: changed a

  changeset 2:2929462c3dff backs out changeset 1:a820f4f40a57

  $ cat a

  a

  $ hg summary

  parent: 2:2929462c3dff tip

   Backed out changeset a820f4f40a57

  branch: default

  commit: (clean)

  update: (current)

  phases: 3 draft

commit option

  $ cd ..

  $ hg init commit

  $ cd commit

  $ echo tomatoes > a

  $ hg add a

  $ hg commit -d '0 0' -m tomatoes

  $ echo chair > b

  $ hg add b

  $ hg commit -d '1 0' -m chair

  $ echo grapes >> a

  $ hg commit -d '2 0' -m grapes

  $ hg backout -d '4 0' 1 --tool=:fail

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  changeset 3:1c2161e97c0a backs out changeset 1:22cb4f70d813

  $ hg summary

  parent: 3:1c2161e97c0a tip

   Backed out changeset 22cb4f70d813

  branch: default

  commit: (clean)

  update: (current)

  phases: 4 draft

  $ echo ypples > a

  $ hg commit -d '5 0' -m ypples

  $ hg backout -d '6 0' 2 --tool=:fail

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges

  [1]

  $ hg summary

  parent: 4:ed99997b793d tip

   ypples

  branch: default

  commit: 1 unresolved (clean)

  update: (current)

  phases: 5 draft

file that was removed is recreated

(this also tests that editor is not invoked if the commit message is

specified explicitly)

  $ cd ..

  $ hg init remove

  $ cd remove

  $ echo content > a

  $ hg commit -d '0 0' -A -m a

  adding a

  $ hg rm a

  $ hg commit -d '1 0' -m b

  $ HGEDITOR=cat hg backout -d '2 0' tip --tool=true -m "Backed out changeset 76862dcce372"

  adding a

  changeset 2:de31bdc76c0d backs out changeset 1:76862dcce372

  $ cat a

  content

  $ hg summary

  parent: 2:de31bdc76c0d tip

   Backed out changeset 76862dcce372

  branch: default

  commit: (clean)

  update: (current)

  phases: 3 draft

backout of backout is as if nothing happened

  $ hg backout -d '3 0' --merge tip --tool=true

  removing a

  changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d

  $ test -f a

  [1]

  $ hg summary

  parent: 3:7f6d0f120113 tip

   Backed out changeset de31bdc76c0d

  branch: default

  commit: (clean)

  update: (current)

  phases: 4 draft

Test that 'hg rollback' restores dirstate just before opening

transaction: in-memory dirstate changes should be written into

'.hg/journal.dirstate' as expected.

  $ echo 'removed soon' > b

  $ hg commit -A -d '4 0' -m 'prepare for subsequent removing'

  adding b

  $ echo 'newly added' > c

  $ hg add c

  $ hg remove b

  $ hg commit -d '5 0' -m 'prepare for subsequent backout'

  $ touch -t 200001010000 c

  $ hg status -A

  C c

  $ hg debugstate --no-dates

  n 644         12 set                 c

  $ hg backout -d '6 0' -m 'to be rollback-ed soon' -r .

  removing c

  adding b

  changeset 6:4bfec048029d backs out changeset 5:fac0b729a654

  $ hg rollback -q

  $ hg status -A

  A b

  R c

  $ hg debugstate --no-dates

  a   0         -1 unset               b

  r   0          0 set                 c

across branch

  $ cd ..

  $ hg init branch

  $ cd branch

  $ echo a > a

  $ hg ci -Am0

  adding a

  $ echo b > b

  $ hg ci -Am1

  adding b

  $ hg co -C 0

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg summary

  parent: 0:f7b1eb17ad24 

   0

  branch: default

  commit: (clean)

  update: 1 new changesets (update)

  phases: 2 draft

should fail

  $ hg backout 1

  abort: cannot backout change that is not an ancestor

  [255]

  $ echo c > c

  $ hg ci -Am2

  adding c

  created new head

  $ hg summary

  parent: 2:db815d6d32e6 tip

   2

  branch: default

  commit: (clean)

  update: 1 new changesets, 2 branch heads (merge)

  phases: 3 draft

should fail

  $ hg backout 1

  abort: cannot backout change that is not an ancestor

  [255]

  $ hg summary

  parent: 2:db815d6d32e6 tip

   2

  branch: default

  commit: (clean)

  update: 1 new changesets, 2 branch heads (merge)

  phases: 3 draft

backout with merge

  $ cd ..

  $ hg init merge

  $ cd merge

  $ echo line 1 > a

  $ echo line 2 >> a

  $ hg commit -d '0 0' -A -m a

  adding a

  $ hg summary

  parent: 0:59395513a13a tip

   a

  branch: default

  commit: (clean)

  update: (current)

  phases: 1 draft

remove line 1

  $ echo line 2 > a

  $ hg commit -d '1 0' -m b

  $ echo line 3 >> a

  $ hg commit -d '2 0' -m c

  $ hg backout --merge -d '3 0' 1 --tool=true

  reverting a

  created new head

  changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182

  merging with changeset 3:26b8ccb9ad91

  merging a

  0 files updated, 1 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ hg commit -d '4 0' -m d

  $ hg summary

  parent: 4:c7df5e0b9c09 tip

   d

  branch: default

  commit: (clean)

  update: (current)

  phases: 5 draft

check line 1 is back

  $ cat a

  line 1

  line 2

  line 3

Test visibility of in-memory dirstate changes outside transaction to

external hook process

  $ cat > $TESTTMP/checkvisibility.sh <<EOF

  > echo "==== \$1:"

  > hg parents --template "{rev}:{node|short}\n"

  > echo "===="

  > EOF

"hg backout --merge REV1" at REV2 below implies steps below:

(1) update to REV1 (REV2 => REV1)

(2) revert by REV1^1

(3) commit backing out revision (REV3)

(4) update to REV2 (REV3 => REV2)

(5) merge with REV3 (REV2 => REV2, REV3)

== test visibility to external preupdate hook

  $ hg update -q -C 2

  $ hg --config extensions.strip= strip 3

  saved backup bundle to * (glob)

  $ cat >> .hg/hgrc <<EOF

  > [hooks]

  > preupdate.visibility = sh $TESTTMP/checkvisibility.sh preupdate

  > EOF

("-m" is needed to avoid writing dirstate changes out at other than

invocation of the hook to be examined)

  $ hg backout --merge -d '3 0' 1 --tool=true -m 'fixed comment'

  ==== preupdate:

  2:6ea3f2a197a2

  ====

  reverting a

  created new head

  changeset 3:d92a3f57f067 backs out changeset 1:5a50a024c182

  ==== preupdate:

  3:d92a3f57f067

  ====

  merging with changeset 3:d92a3f57f067

  ==== preupdate:

  2:6ea3f2a197a2

  ====

  merging a

  0 files updated, 1 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ cat >> .hg/hgrc <<EOF

  > [hooks]

  > preupdate.visibility =

  > EOF

== test visibility to external update hook

  $ hg update -q -C 2

  $ hg --config extensions.strip= strip 3

  saved backup bundle to * (glob)

  $ cat >> .hg/hgrc <<EOF

  > [hooks]

  > update.visibility = sh $TESTTMP/checkvisibility.sh update

  > EOF

  $ hg backout --merge -d '3 0' 1 --tool=true -m 'fixed comment'

  ==== update:

  1:5a50a024c182

  ====

  reverting a

  created new head

  changeset 3:d92a3f57f067 backs out changeset 1:5a50a024c182

  ==== update:

  2:6ea3f2a197a2

  ====

  merging with changeset 3:d92a3f57f067

  merging a

  ==== update:

  2:6ea3f2a197a2

  3:d92a3f57f067

  ====

  0 files updated, 1 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ cat >> .hg/hgrc <<EOF

  > [hooks]

  > update.visibility =

  > EOF

  $ cd ..

backout should not back out subsequent changesets

  $ hg init onecs

  $ cd onecs

  $ echo 1 > a

  $ hg commit -d '0 0' -A -m a

  adding a

  $ echo 2 >> a

  $ hg commit -d '1 0' -m b

  $ echo 1 > b

  $ hg commit -d '2 0' -A -m c

  adding b

  $ hg summary

  parent: 2:882396649954 tip

   c

  branch: default

  commit: (clean)

  update: (current)

  phases: 3 draft

without --merge

  $ hg backout --no-commit -d '3 0' 1 --tool=true

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  changeset 22bca4c721e5 backed out, don't forget to commit.

  $ hg locate b

  b

  $ hg update -C tip

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg locate b

  b

  $ hg summary

  parent: 2:882396649954 tip

   c