equal
deleted
inserted
replaced
85 man = repo.manifest.ancestor(m1n, m2n) |
85 man = repo.manifest.ancestor(m1n, m2n) |
86 m1 = repo.manifest.read(m1n) |
86 m1 = repo.manifest.read(m1n) |
87 m2 = repo.manifest.read(m2n).copy() |
87 m2 = repo.manifest.read(m2n).copy() |
88 ma = repo.manifest.read(man) |
88 ma = repo.manifest.read(man) |
89 |
89 |
90 if not forcemerge and not overwrite: |
90 if not force: |
91 for f in unknown: |
91 for f in unknown: |
92 if f in m2: |
92 if f in m2: |
93 t1 = repo.wread(f) |
93 t1 = repo.wread(f) |
94 t2 = repo.file(f).read(m2[f]) |
94 t2 = repo.file(f).read(m2[f]) |
95 if cmp(t1, t2) != 0: |
95 if cmp(t1, t2) != 0: |