Mercurial > hgsubversion

diff push_cmd.py @ 62:cc5ebdb1e8d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push_cmd: Further simplified some logic thanks to an improved test.
author Augie Fackler <durin42@gmail.com>
date Thu, 06 Nov 2008 09:24:33 -0600
parents 41dc00c7aef1
children b33940d54fe2
line wrap: on
line diff
--- a/push_cmd.py
+++ b/push_cmd.py
@@ -107,11 +107,9 @@ def commit_from_rev(ui, repo, rev_ctx, h
                         added_dirs.append(dirname[:-1])
             else:
                 base_data = parent.filectx(file).data()
-                if 'x' in parent.filectx(file).flags():
-                    if 'svn:executable' in props.setdefault(file, {}):
-                        del props[file]['svn:executable']
-                    else:
-                        props.setdefault(file, {})['svn:executable'] = None
+                if ('x' in parent.filectx(file).flags()
+                    and 'x' not in rev_ctx.filectx(file).flags()):
+                    props.setdefault(file, {})['svn:executable'] = None
                 if ('l' in parent.filectx(file).flags()
                     and 'l' not in rev_ctx.filectx(file).flags()):
                     props.setdefault(file, {})['svn:special'] = None