equal
deleted
inserted
replaced
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 |