Mercurial > hg
annotate tests/test-dirstate-backup.t @ 44909:d452acc8cce8 stable
flags: account for flag change when tracking rename relevant to merge
There are some logic filtering rename to the one relevant to the merge. That
logic was oblivious of flag change, leading to exec flag being dropped when
merged with a renamed.
There are two others bugs affecting this scenario. This patch fix the was where
there is not modification involved except for the flag change. Fixes for the
other bug are coming in later changesets.
Differential Revision: https://phab.mercurial-scm.org/D8531
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 16 May 2020 20:37:56 +0200 |
parents | c2b30348930f |
children | 8d72e29ad1e0 |
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 |
2c80a864e83e
tests: add a test demonstrating failure to clean up dirstate backups
Mark Thomas <mbthomas@fb.com>
parents:
diff
changeset
|
12 [255] |
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 |