Show More
@@ -573,18 +573,7 b' def collapse(repo, first, last, commitop' | |||||
573 | copied = copies.pathcopies(base, last) |
|
573 | copied = copies.pathcopies(base, last) | |
574 |
|
574 | |||
575 | # prune files which were reverted by the updates |
|
575 | # prune files which were reverted by the updates | |
576 | def samefile(f): |
|
576 | files = [f for f in files if not cmdutil.samefile(f, last, base)] | |
577 | if f in last.manifest(): |
|
|||
578 | a = last.filectx(f) |
|
|||
579 | if f in base.manifest(): |
|
|||
580 | b = base.filectx(f) |
|
|||
581 | return (a.data() == b.data() |
|
|||
582 | and a.flags() == b.flags()) |
|
|||
583 | else: |
|
|||
584 | return False |
|
|||
585 | else: |
|
|||
586 | return f not in base.manifest() |
|
|||
587 | files = [f for f in files if not samefile(f)] |
|
|||
588 | # commit version of these files as defined by head |
|
577 | # commit version of these files as defined by head | |
589 | headmf = last.manifest() |
|
578 | headmf = last.manifest() | |
590 | def filectxfn(repo, ctx, path): |
|
579 | def filectxfn(repo, ctx, path): |
General Comments 0
You need to be logged in to leave comments.
Login now