Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 6030:d0dbae32517c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert: revert clean files when only a change of flags is needed
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 08 Feb 2008 18:07:55 -0200
parents a732eebf1958
children 7383384793fb
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Feb 08 18:07:55 2008 -0200
+++ b/mercurial/commands.py	Fri Feb 08 18:07:55 2008 -0200
@@ -2429,7 +2429,8 @@
                     if mfentry:
                         # if version of file is same in parent and target
                         # manifests, do nothing
-                        if pmf[abs] != mfentry:
+                        if (pmf[abs] != mfentry or
+                            pmf.flags(abs) != mf.flags(abs)):
                             handle(revert, False)
                     else:
                         handle(remove, False)