##// END OF EJS Templates
mergestate.add: store absentfilectxes as nullhex...
Siddharth Agarwal -
r27049:0d61f7ec default
parent child Browse files
Show More
@@ -366,6 +366,9 b' class mergestate(object):'
366 366
367 367 note: also write the local version to the `.hg/merge` directory.
368 368 """
369 if fcl.isabsent():
370 hash = nullhex
371 else:
369 372 hash = util.sha1(fcl.path()).hexdigest()
370 373 self._repo.vfs.write('merge/' + hash, fcl.data())
371 374 self._state[fd] = ['u', hash, fcl.path(),
General Comments 0
You need to be logged in to leave comments. Login now