comparison mercurial/filemerge.py @ 27720:89f49813526c

status: change + back out == clean (API) After backing out a change, so the file contents is equal to a previous revision of itself, we currently report the status between the two equal revisions as modified. This is because context._buildstatus() reports any file whose new nodeid is not equal to _newnode as modified. That magic nodeid is given only to files added or modified in the working directory, so any file whose nodeid has changed between two revisions will be reported as modified. Fix by simply comparing the file contents for all cases where the nodeid changed, whether they are in the working copy or committed. Marking with (API) as it subtly changes the semantics of the method.
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 04 Jan 2016 10:13:29 -0800
parents 07fc2f2134ba
children 66d085e55ecd
comparison
equal deleted inserted replaced
27719:7ce8a13b8d77 27720:89f49813526c