359 elif fparent1 == nullid: |
359 elif fparent1 == nullid: |
360 fparent1, fparent2 = fparent2, nullid |
360 fparent1, fparent2 = fparent2, nullid |
361 elif fparent2 != nullid: |
361 elif fparent2 != nullid: |
362 if ms.active() and ms.extras(fname).get(b'filenode-source') == b'other': |
362 if ms.active() and ms.extras(fname).get(b'filenode-source') == b'other': |
363 fparent1, fparent2 = fparent2, nullid |
363 fparent1, fparent2 = fparent2, nullid |
|
364 elif ms.active() and ms.extras(fname).get(b'merged') != b'yes': |
|
365 fparent1, fparent2 = fparent1, nullid |
364 # is one parent an ancestor of the other? |
366 # is one parent an ancestor of the other? |
365 else: |
367 else: |
366 fparentancestors = flog.commonancestorsheads(fparent1, fparent2) |
368 fparentancestors = flog.commonancestorsheads(fparent1, fparent2) |
367 if fparent1 in fparentancestors: |
369 if fparent1 in fparentancestors: |
368 fparent1, fparent2 = fparent2, nullid |
370 fparent1, fparent2 = fparent2, nullid |