Mercurial > hg
comparison tests/test-commit.t @ 13899:a7cd0eee396b
commit: note when files are missing
Before, you could experience the following strange interaction:
$ hg commit
nothing changed
$ hg merge
abort: outstanding uncommitted changes
which confused at least one user in #mercurial.
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Wed, 06 Apr 2011 16:21:12 +0200 |
parents | 931a72e00efa |
children | 973959fbe8ec |
comparison
equal
deleted
inserted
replaced
13898:77b09a7fc8fc | 13899:a7cd0eee396b |
---|---|
30 | 30 |
31 $ echo bar > bar | 31 $ echo bar > bar |
32 $ hg add bar | 32 $ hg add bar |
33 $ rm bar | 33 $ rm bar |
34 $ hg commit -m commit-8 | 34 $ hg commit -m commit-8 |
35 nothing changed | 35 nothing changed (1 missing files, see 'hg status') |
36 [1] | 36 [1] |
37 $ hg commit -m commit-8-2 bar | 37 $ hg commit -m commit-8-2 bar |
38 abort: bar: file not found! | 38 abort: bar: file not found! |
39 [255] | 39 [255] |
40 | 40 |