Mercurial > hg
view tests/test-legacy-exit-code.t @ 46580:2076df13d00f
copies-rust: refactor the "deletion" case
We rearrange the code to single out the case where information need to be
overwritten on both side of the merge. This open the way to better dealing with
this case.
Differential Revision: https://phab.mercurial-scm.org/D9651
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 16 Dec 2020 10:59:00 +0100 |
parents | 95c4cca641f6 |
children | 55c6ebd11cb9 |
line wrap: on
line source
Tests that the exit code is as expected when ui.detailed-exit-code is *not* enabled. $ cat >> $HGRCPATH << EOF > [ui] > detailed-exit-code=no > EOF $ hg init $ echo a > a Expect exit code 0 on success $ hg ci -Aqm initial $ hg co nonexistent abort: unknown revision 'nonexistent' [255] $ hg co 'none()' abort: empty revision set [255] $ hg co 'invalid(' hg: parse error at 8: not a prefix: end (invalid( ^ here) [255] $ hg co 'invalid(' hg: parse error at 8: not a prefix: end (invalid( ^ here) [255] $ hg continue abort: no operation in progress [255] $ hg st --config a=b abort: malformed --config option: 'a=b' (use --config section.name=value) [255] $ echo b > a $ hg ci -m second $ echo c > a $ hg ci -m third $ hg --config extensions.rebase= rebase -r . -d 0 -q warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') [1]