Mercurial > hg

comparison tests/test-histedit-non-commute-abort.t @ 48054:f27a83399abb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: use more specific exceptions for more detailed exit codes Differential Revision: https://phab.mercurial-scm.org/D11509
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 28 Sep 2021 09:32:24 -0700
parents 5a0b930cfb3e
children f1162b125991
comparison
equal deleted inserted replaced
48053:6256c7525222 48054:f27a83399abb
158 $ echo collision > c 158 $ echo collision > c
159 159
160 $ hg histedit e860deea161a 160 $ hg histedit e860deea161a
161 c: untracked file differs 161 c: untracked file differs
162 abort: untracked files in working directory conflict with files in 055a42cdd887 162 abort: untracked files in working directory conflict with files in 055a42cdd887
163 [255] 163 [20]
164 164
165 We should have detected the collision early enough we're not in a 165 We should have detected the collision early enough we're not in a
166 histedit state, and p1 is unchanged. 166 histedit state, and p1 is unchanged.
167 167
168 $ hg log -r 'p1()' -T'{node}\n' 168 $ hg log -r 'p1()' -T'{node}\n'