Mercurial > public > mercurial-scm > hg-stable
diff mercurial/context.py @ 27668:369c8f9453c2
status: revert + flag-change == modified
After just changing the flag on a file, plain 'hg status' will report
the file as modified. However, after reverting a file to a previous
revision's state and changing the flag, it will be reported as clean.
Fix by comparing the flags that were previously ignored in
context._buildstatus().
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 04 Jan 2016 09:44:58 -0800 |
| parents | b502138f5faa |
| children | 89f49813526c |
line wrap: on
line diff
--- a/mercurial/context.py Tue Jan 05 20:52:34 2016 -0800 +++ b/mercurial/context.py Mon Jan 04 09:44:58 2016 -0800 @@ -144,6 +144,8 @@ # The file was not a new file in mf2, so an entry # from diff is really a difference. modified.append(fn) + elif flag1 != flag2: + modified.append(fn) elif self[fn].cmp(other[fn]): # node2 was newnode, but the working file doesn't # match the one in mf1.