mercurial/commit.py
branchstable
changeset 47941 5b9de38a0356
parent 47012 d55b71393907
child 48716 f1eb77dceb36
equal deleted inserted replaced
47940:cc33deae66a1 47941:5b9de38a0356
   387         force_new_node = True
   387         force_new_node = True
   388     # is the file changed?
   388     # is the file changed?
   389     text = fctx.data()
   389     text = fctx.data()
   390     if (
   390     if (
   391         fparent2 != repo.nullid
   391         fparent2 != repo.nullid
       
   392         or fparent1 == repo.nullid
   392         or meta
   393         or meta
   393         or flog.cmp(fparent1, text)
   394         or flog.cmp(fparent1, text)
   394         or force_new_node
   395         or force_new_node
   395     ):
   396     ):
   396         if touched is None:  # do not overwrite added
   397         if touched is None:  # do not overwrite added