Mercurial > hg > mercurial
diff mercurial-tests/testData/README @ 474:6b447cd40492 Faradi-7.1.x
TW-10076 allow to ignore commits where all files excluded by checkout rules
Since 7.1 hg-plugin marks empty commits as cannot be ignored. We do that
in order to show empty commits which close the branch. Since hg log doesn't
contain any signs that commit closes branch, hg-plugin detects it by checking
if commit has no changed files. We did that after applying checkout rules, as a
result some commits with all files excluded were marked as cannot be ignored
which is wrong. Now hg-plugin checks if commit is empty before applying
checkout rules.
| author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
|---|---|
| date | Mon, 10 Sep 2012 20:02:07 +0400 |
| parents | 63a69ed16c88 |
| children | 2b8299ba321d |
line wrap: on
line diff
--- a/mercurial-tests/testData/README Fri Sep 07 16:50:49 2012 +0400 +++ b/mercurial-tests/testData/README Mon Sep 10 20:02:07 2012 +0400 @@ -24,8 +24,14 @@ rep2 history: -@ 18:df04faa7575a merge personal-branch tip +o 21:a2672ee13212 Tag for test //add tag t1 on 43023ea3f13b +| +o 20:43023ea3f13b Merge closed personal-branch |\ +| o 19:ca64c523f54c Close personal-branch +| | +@ | 18:df04faa7575a merge personal-branch tip +|\| | o 17:9ec402c74298 another change to file.txt in personal-branch (personal-branch) | | o | 16:505c5b9d01e6 change file.txt back