Mercurial > public > mercurial-scm > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 27667:37df458d60c2 | 27668:369c8f9453c2 |
|---|---|
| 141 elif node2 is None: | 141 elif node2 is None: |
| 142 removed.append(fn) | 142 removed.append(fn) |
| 143 elif node2 != _newnode: | 143 elif node2 != _newnode: |
| 144 # The file was not a new file in mf2, so an entry | 144 # The file was not a new file in mf2, so an entry |
| 145 # from diff is really a difference. | 145 # from diff is really a difference. |
| 146 modified.append(fn) | |
| 147 elif flag1 != flag2: | |
| 146 modified.append(fn) | 148 modified.append(fn) |
| 147 elif self[fn].cmp(other[fn]): | 149 elif self[fn].cmp(other[fn]): |
| 148 # node2 was newnode, but the working file doesn't | 150 # node2 was newnode, but the working file doesn't |
| 149 # match the one in mf1. | 151 # match the one in mf1. |
| 150 modified.append(fn) | 152 modified.append(fn) |