Mercurial > hg
view tests/test-merge-halt.t @ 34822:c1e7ce11db9b
phase: isolate logic to update remote phrase through bundle2 pushkey
Move the logic to build bundle2 pushkey part into its dedicated function. It
will help to keep the logic clear when adding support for sending phases change
using 'phase-heads' part.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Wed, 20 Sep 2017 19:17:37 +0200 |
parents | 284fa44f7f39 |
children | 05535d0dea68 |
line wrap: on
line source
$ cat >> $HGRCPATH <<EOF > [extensions] > rebase= > [phases] > publish=False > [merge] > EOF $ hg init repo $ cd repo $ echo a > a $ echo b > b $ hg commit -qAm ab $ echo c >> a $ echo c >> b $ hg commit -qAm c $ hg up -q ".^" $ echo d >> a $ echo d >> b $ hg commit -qAm d Testing on-failure=continue $ echo on-failure=continue >> $HGRCPATH $ hg rebase -s 1 -d 2 --tool false rebasing 1:1f28a51c3c9b "c" merging a merging b merging a failed! merging b failed! unresolved conflicts (see hg resolve, then hg rebase --continue) [1] $ hg resolve --list U a U b $ hg rebase --abort rebase aborted Testing on-failure=halt $ echo on-failure=halt >> $HGRCPATH $ hg rebase -s 1 -d 2 --tool false rebasing 1:1f28a51c3c9b "c" merging a merging b merging a failed! merge halted after failed merge (see hg resolve) [1] $ hg resolve --list U a U b $ hg rebase --abort rebase aborted Testing on-failure=prompt $ echo on-failure=prompt >> $HGRCPATH $ cat <<EOS | hg rebase -s 1 -d 2 --tool false --config ui.interactive=1 > y > n > EOS rebasing 1:1f28a51c3c9b "c" merging a merging b merging a failed! continue merge operation (yn)? y merging b failed! continue merge operation (yn)? n merge halted after failed merge (see hg resolve) [1] $ hg resolve --list U a U b $ hg rebase --abort rebase aborted