Show More
@@ -400,10 +400,6 b' class localrepository(object):' | |||||
400 | fp1 = m1.get(f, nullid) |
|
400 | fp1 = m1.get(f, nullid) | |
401 | fp2 = m2.get(f, nullid) |
|
401 | fp2 = m2.get(f, nullid) | |
402 |
|
402 | |||
403 | # is the same revision on two branches of a merge? |
|
|||
404 | if fp2 == fp1: |
|
|||
405 | fp2 = nullid |
|
|||
406 |
|
||||
407 | if fp2 != nullid: |
|
403 | if fp2 != nullid: | |
408 | # is one parent an ancestor of the other? |
|
404 | # is one parent an ancestor of the other? | |
409 | fpa = r.ancestor(fp1, fp2) |
|
405 | fpa = r.ancestor(fp1, fp2) | |
@@ -413,7 +409,7 b' class localrepository(object):' | |||||
413 | fp2 = nullid |
|
409 | fp2 = nullid | |
414 |
|
410 | |||
415 | # is the file unmodified from the parent? |
|
411 | # is the file unmodified from the parent? | |
416 | if not meta and t == r.read(fp1): |
|
412 | if not meta and t == r.read(fp1) and fp2 == nullid: | |
417 | # record the proper existing parent in manifest |
|
413 | # record the proper existing parent in manifest | |
418 | # no need to add a revision |
|
414 | # no need to add a revision | |
419 | new[f] = fp1 |
|
415 | new[f] = fp1 |
General Comments 0
You need to be logged in to leave comments.
Login now