Lines Matching refs:diff
32 (see 'diff', below) will be applied if applicable.
41 diff (handled by CdmUncommittedBackup)
42 A Git-formatted diff containing uncommitted changes.
46 applied manually, rather than by the diff.
265 fp = open(self.bu.backupfile('diff'), 'w')
267 fp.write(self.ws.diff(opts=opts))
269 raise util.Abort("couldn't save working copy diff: %s" % e)
290 diff = self.bu.backupfile('diff')
308 if not os.path.exists(diff):
334 patchname=diff, strip=1, files=files)
336 fuzz = patch.patch(diff, self.ws.ui, strip=1,
339 raise util.Abort('working copy diff applied with fuzz')
341 raise util.Abort("couldn't apply working copy diff: %s\n"
342 " %s" % (diff, e))
377 curdiff = self.ws.diff(opts=opts)
379 diff = self.bu.backupfile('diff')
380 if os.path.exists(diff):
383 fd = open(diff)
386 raise util.Abort("couldn't open backup diff %s\n"
387 " %s" % (diff, e))
420 for fname in ('dirstate', 'diff', 'renames'):