Mercurial > hg-stable
comparison mercurial/merge.py @ 6275:fda369b5779c
diff: use copy smarts from copies.py
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 15 Mar 2008 10:02:31 -0500 |
| parents | f3f383efbeae |
| children | 6aa4a3fa4e60 |
comparison
equal
deleted
inserted
replaced
| 6274:f3f383efbeae | 6275:fda369b5779c |
|---|---|
| 98 | 98 |
| 99 def act(msg, m, f, *args): | 99 def act(msg, m, f, *args): |
| 100 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) | 100 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) |
| 101 action.append((f, m) + args) | 101 action.append((f, m) + args) |
| 102 | 102 |
| 103 if not (backwards or overwrite): | 103 if pa and not (backwards or overwrite): |
| 104 copy, diverge = copies.copies(repo, p1, p2, pa) | 104 copy, diverge = copies.copies(repo, p1, p2, pa) |
| 105 copied = dict.fromkeys(copy.values()) | 105 copied = dict.fromkeys(copy.values()) |
| 106 for of, fl in diverge.items(): | 106 for of, fl in diverge.items(): |
| 107 act("divergent renames", "dr", of, fl) | 107 act("divergent renames", "dr", of, fl) |
| 108 | 108 |