Mercurial > hg
comparison mercurial/merge.py @ 8751:e8d80e0835c7
merge: make locally-added file test more correct
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 08 Jun 2009 18:14:44 -0500 |
| parents | 9b8733291dd0 |
| children | f177bdab261b |
comparison
equal
deleted
inserted
replaced
| 8750:9b8733291dd0 | 8751:e8d80e0835c7 |
|---|---|
| 196 act("remote renamed directory to " + f2, "d", | 196 act("remote renamed directory to " + f2, "d", |
| 197 f, None, f2, m1.flags(f)) | 197 f, None, f2, m1.flags(f)) |
| 198 else: # case 2 A,B/B/B or case 4,21 A/B/B | 198 else: # case 2 A,B/B/B or case 4,21 A/B/B |
| 199 act("local copied/moved to " + f2, "m", | 199 act("local copied/moved to " + f2, "m", |
| 200 f, f2, f, fmerge(f, f2, f2), False) | 200 f, f2, f, fmerge(f, f2, f2), False) |
| 201 elif n[20:] == "a": # added, no remote | |
| 202 act("remote deleted", "f", f) | |
| 203 elif f in ma: # clean, a different, no remote | 201 elif f in ma: # clean, a different, no remote |
| 204 if n != ma[f]: | 202 if n != ma[f]: |
| 205 if repo.ui.prompt( | 203 if repo.ui.prompt( |
| 206 _(" local changed %s which remote deleted\n" | 204 _(" local changed %s which remote deleted\n" |
| 207 "use (c)hanged version or (d)elete?") % f, | 205 "use (c)hanged version or (d)elete?") % f, |
| 208 (_("&Changed"), _("&Delete")), _("c")) == _("d"): | 206 (_("&Changed"), _("&Delete")), _("c")) == _("d"): |
| 209 act("prompt delete", "r", f) | 207 act("prompt delete", "r", f) |
| 210 else: | 208 else: |
| 211 act("prompt keep", "a", f) | 209 act("prompt keep", "a", f) |
| 210 elif n[20:] == "a": # added, no remote | |
| 211 act("remote deleted", "f", f) | |
| 212 elif n[20:] != "u": | 212 elif n[20:] != "u": |
| 213 act("other deleted", "r", f) | 213 act("other deleted", "r", f) |
| 214 | 214 |
| 215 for f, n in m2.iteritems(): | 215 for f, n in m2.iteritems(): |
| 216 if partial and not partial(f): | 216 if partial and not partial(f): |