Mercurial > hg
annotate tests/test-dirstate-backup.t @ 49986:dbcc45221c1f
test: explicitly "add" file before some commit in test-rollback.t
`hg commit -A` will revert the `hg addremove` step if the commit fails. However
`hg rollback` currently does not.
We are about to improve internal consistency around transaction and dirstate and the behavior of `hg rollback` will align on the other behavior in the process.
Before doing so, we make sure the test is using a separate call to `hg add` to
avoid the test scenario to be affected by that future change.
note: the behavior change for `hg rollback` seems fine as it affect a niche
usecase and `hg rollback` usage have been strongly discouraged for a while.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 13 Feb 2023 17:42:32 +0100 |
parents | 8d72e29ad1e0 |
children | ffd19d73518d |
rev | line source |
---|---|
34939
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
1 Set up |
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
2 |
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
3 $ hg init repo |
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
4 $ cd repo |
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
5 |
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
6 Try to import an empty patch |
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
7 |
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
8 $ hg import --no-commit - <<EOF |
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
9 > EOF |
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
10 applying patch from stdin |
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
11 abort: stdin: no diffs found |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
34940
diff
changeset
|
12 [10] |
34939
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
13 |
34940
c2b30348930f
dirstate: clean up when restoring identical backups
Mark Thomas <mbthomas@fb.com>
parents:
34939
diff
changeset
|
14 No dirstate backups are left behind |
34939
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
15 |
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
16 $ ls .hg/dirstate* | sort |
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
17 .hg/dirstate |
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
18 |