Mercurial > hg-stable
diff 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 |
line wrap: on
line diff
--- a/tests/test-commit.t Wed Apr 06 15:26:49 2011 +0200 +++ b/tests/test-commit.t Wed Apr 06 16:21:12 2011 +0200 @@ -32,7 +32,7 @@ $ hg add bar $ rm bar $ hg commit -m commit-8 - nothing changed + nothing changed (1 missing files, see 'hg status') [1] $ hg commit -m commit-8-2 bar abort: bar: file not found!