equal
deleted
inserted
replaced
164 ui.debug(_('running %r in %s\n') % (cmdline, tmproot)) |
164 ui.debug(_('running %r in %s\n') % (cmdline, tmproot)) |
165 util.system(cmdline, cwd=tmproot) |
165 util.system(cmdline, cwd=tmproot) |
166 |
166 |
167 for copy_fn, working_fn, mtime in fns_and_mtime: |
167 for copy_fn, working_fn, mtime in fns_and_mtime: |
168 if os.path.getmtime(copy_fn) != mtime: |
168 if os.path.getmtime(copy_fn) != mtime: |
169 ui.debug(_('File changed while diffing. ' |
169 ui.debug(_('file changed while diffing. ' |
170 'Overwriting: %s (src: %s)\n') % (working_fn, copy_fn)) |
170 'Overwriting: %s (src: %s)\n') % (working_fn, copy_fn)) |
171 util.copyfile(copy_fn, working_fn) |
171 util.copyfile(copy_fn, working_fn) |
172 |
172 |
173 return 1 |
173 return 1 |
174 finally: |
174 finally: |