##// END OF EJS Templates
extdiff: use absolute paths for any temporary files...
jfh -
r13758:5c0e1222 default
parent child Browse files
Show More
@@ -187,14 +187,14 b' def dodiff(ui, repo, diffcmd, diffopts, '
187 # Handle bogus modifies correctly by checking if the files exist
187 # Handle bogus modifies correctly by checking if the files exist
188 if len(common) == 1:
188 if len(common) == 1:
189 common_file = util.localpath(common.pop())
189 common_file = util.localpath(common.pop())
190 dir1a = os.path.join(dir1a, common_file)
190 dir1a = os.path.join(tmproot, dir1a, common_file)
191 label1a = common_file + rev1a
191 label1a = common_file + rev1a
192 if not os.path.isfile(os.path.join(tmproot, dir1a)):
192 if not os.path.isfile(dir1a):
193 dir1a = os.devnull
193 dir1a = os.devnull
194 if do3way:
194 if do3way:
195 dir1b = os.path.join(dir1b, common_file)
195 dir1b = os.path.join(tmproot, dir1b, common_file)
196 label1b = common_file + rev1b
196 label1b = common_file + rev1b
197 if not os.path.isfile(os.path.join(tmproot, dir1b)):
197 if not os.path.isfile(dir1b):
198 dir1b = os.devnull
198 dir1b = os.devnull
199 dir2 = os.path.join(dir2root, dir2, common_file)
199 dir2 = os.path.join(dir2root, dir2, common_file)
200 label2 = common_file + rev2
200 label2 = common_file + rev2
General Comments 0
You need to be logged in to leave comments. Login now