Mercurial > hgsubversion
diff push_cmd.py @ 60:41dc00c7aef1
Fixed a problem where if you edited an existing symlink by replacing with another symlink, things would get corrupt.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Thu, 06 Nov 2008 09:07:13 -0600 |
parents | c3c5546eefb1 |
children | cc5ebdb1e8d4 |
line wrap: on
line diff
--- a/push_cmd.py +++ b/push_cmd.py @@ -112,11 +112,9 @@ def commit_from_rev(ui, repo, rev_ctx, h del props[file]['svn:executable'] else: props.setdefault(file, {})['svn:executable'] = None - if 'l' in parent.filectx(file).flags(): - if props.setdefault(file, {})['svn:special']: - del props[file]['svn:special'] - else: - props.setdefault(file, {})['svn:special'] = None + if ('l' in parent.filectx(file).flags() + and 'l' not in rev_ctx.filectx(file).flags()): + props.setdefault(file, {})['svn:special'] = None action = 'modify' else: base_data = parent.filectx(file).data()