Mercurial > hg
annotate tests/test-contrib-emacs.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 | 19979b8b87e2 |
| children | 814c7430f828 |
| rev | line source |
|---|---|
|
41788
19979b8b87e2
tests: add test for hg-test-mode emacs code
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
1 #require emacs |
|
19979b8b87e2
tests: add test for hg-test-mode emacs code
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
2 $ emacs -q -no-site-file -batch -l $TESTDIR/../contrib/hg-test-mode.el \ |
|
19979b8b87e2
tests: add test for hg-test-mode emacs code
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
3 > -f ert-run-tests-batch-and-exit |
|
19979b8b87e2
tests: add test for hg-test-mode emacs code
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
4 Running 1 tests (*) (glob) |
|
19979b8b87e2
tests: add test for hg-test-mode emacs code
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
5 passed 1/1 hg-test-mode--compilation-mode-support |
|
19979b8b87e2
tests: add test for hg-test-mode emacs code
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
6 |
|
19979b8b87e2
tests: add test for hg-test-mode emacs code
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
7 Ran 1 tests, 1 results as expected (*) (glob) |
|
19979b8b87e2
tests: add test for hg-test-mode emacs code
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
8 |