Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 8b541abb6d2a…

Parents eafc8ffb4511…

Parents d921582266a5…

by Steve Borho

Changes to one file · Browse files at 8b541abb6d2a Showing diff from parent eafc8ffb4511 d921582266a5 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​visdiff.py Stacked
 
327
328
329
330
331
332
333
 
 
 
 
 
 
 
334
335
336
 
327
328
329
 
 
 
 
330
331
332
333
334
335
336
337
338
339
@@ -327,10 +327,13 @@
    # detect if changes were made to mirrored working files   for copy_fn, working_fn, mtime in fns_and_mtime: - if os.path.getmtime(copy_fn) != mtime: - ui.debug('file changed while diffing. ' - 'Overwriting: %s (src: %s)\n' % (working_fn, copy_fn)) - util.copyfile(copy_fn, working_fn) + try: + if os.path.getmtime(copy_fn) != mtime: + ui.debug('file changed while diffing. ' + 'Overwriting: %s (src: %s)\n' % (working_fn, copy_fn)) + util.copyfile(copy_fn, working_fn) + except EnvironmentError: + pass # Ignore I/O errors or missing files     def dodiffwrapper():   try: