comparison 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
comparison
equal deleted inserted replaced
59:430af23bef4a 60:41dc00c7aef1
110 if 'x' in parent.filectx(file).flags(): 110 if 'x' in parent.filectx(file).flags():
111 if 'svn:executable' in props.setdefault(file, {}): 111 if 'svn:executable' in props.setdefault(file, {}):
112 del props[file]['svn:executable'] 112 del props[file]['svn:executable']
113 else: 113 else:
114 props.setdefault(file, {})['svn:executable'] = None 114 props.setdefault(file, {})['svn:executable'] = None
115 if 'l' in parent.filectx(file).flags(): 115 if ('l' in parent.filectx(file).flags()
116 if props.setdefault(file, {})['svn:special']: 116 and 'l' not in rev_ctx.filectx(file).flags()):
117 del props[file]['svn:special'] 117 props.setdefault(file, {})['svn:special'] = None
118 else:
119 props.setdefault(file, {})['svn:special'] = None
120 action = 'modify' 118 action = 'modify'
121 else: 119 else:
122 base_data = parent.filectx(file).data() 120 base_data = parent.filectx(file).data()
123 action = 'delete' 121 action = 'delete'
124 file_data[file] = base_data, new_data, action 122 file_data[file] = base_data, new_data, action