tests/test-absorb-unfinished.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Tue, 29 Oct 2019 11:07:25 +0100
branchstable
changeset 43348 daa3b58906d5
parent 42128 537a8aeb9977
child 45150 dc5e5577af39
permissions -rw-r--r--
formatting: drop `grey`, our custom black version Now that the official black has all we want, we can drop this.

  $ cat >> $HGRCPATH << EOF
  > [extensions]
  > absorb=
  > EOF

Abort absorb if there is an unfinished operation.

  $ hg init abortunresolved
  $ cd abortunresolved

  $ echo "foo1" > foo.whole
  $ hg commit -Aqm "foo 1"

  $ hg update null
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ echo "foo2" > foo.whole
  $ hg commit -Aqm "foo 2"

  $ hg --config extensions.rebase= rebase -r 1 -d 0
  rebasing 1:c3b6dc0e177a "foo 2" (tip)
  merging foo.whole
  warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')
  unresolved conflicts (see hg resolve, then hg rebase --continue)
  [1]

  $ hg --config extensions.rebase= absorb
  abort: rebase in progress
  (use 'hg rebase --continue' or 'hg rebase --abort')
  [255]