equal
deleted
inserted
replaced
323 elif fparent2 in fparentancestors: |
323 elif fparent2 in fparentancestors: |
324 fparent2 = nullid |
324 fparent2 = nullid |
325 elif not fparentancestors: |
325 elif not fparentancestors: |
326 # TODO: this whole if-else might be simplified much more |
326 # TODO: this whole if-else might be simplified much more |
327 ms = mergestate.mergestate.read(repo) |
327 ms = mergestate.mergestate.read(repo) |
328 if ( |
328 if ms.extras(fname).get(b'filenode-source') == b'other': |
329 fname in ms |
|
330 and ms[fname] == mergestate.MERGE_RECORD_MERGED_OTHER |
|
331 ): |
|
332 fparent1, fparent2 = fparent2, nullid |
329 fparent1, fparent2 = fparent2, nullid |
333 |
330 |
334 # is the file changed? |
331 # is the file changed? |
335 text = fctx.data() |
332 text = fctx.data() |
336 if fparent2 != nullid or meta or flog.cmp(fparent1, text): |
333 if fparent2 != nullid or meta or flog.cmp(fparent1, text): |