Mercurial > hg
view tests/test-legacy-exit-code.t @ 48976:877d7e1a4223 stable
amend: fix amend with copies in extras
If copy information is stored only in the commit extras and not in
filelogs, then they get lost on amend if the file wasn't also modified
in the working copy. That's because we create `filectx` object from
the old commit in those cases, and the `.copysource()` of such objects
read only from the filelog. This patch fixes it by always creating a
new `memfilectx` in these cases, passing the calculated copy
information to it.
Differential Revision: https://phab.mercurial-scm.org/D12387
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 18 Mar 2022 21:15:54 -0700 |
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]