Mercurial > hg
comparison mercurial/merge.py @ 18339:aadefcee1f5e
merge: remove "case" comments
The comments introduced in f05c182430a0 seems important ... but the context has
apparently been lost and they do not have any value now.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Tue, 15 Jan 2013 01:05:12 +0100 |
| parents | 384df4db6520 |
| children | 760c0d67ce5e |
comparison
equal
deleted
inserted
replaced
| 18338:384df4db6520 | 18339:aadefcee1f5e |
|---|---|
| 255 pass | 255 pass |
| 256 elif f in movewithdir: # directory rename | 256 elif f in movewithdir: # directory rename |
| 257 f2 = movewithdir[f] | 257 f2 = movewithdir[f] |
| 258 act("remote renamed directory to " + f2, "d", f, None, f2, | 258 act("remote renamed directory to " + f2, "d", f, None, f2, |
| 259 m1.flags(f)) | 259 m1.flags(f)) |
| 260 elif f in copy: # case 2 A,B/B/B or case 4,21 A/B/B | 260 elif f in copy: |
| 261 f2 = copy[f] | 261 f2 = copy[f] |
| 262 act("local copied/moved to " + f2, "m", f, f2, f, False) | 262 act("local copied/moved to " + f2, "m", f, f2, f, False) |
| 263 elif f in ma: # clean, a different, no remote | 263 elif f in ma: # clean, a different, no remote |
| 264 if n != ma[f]: | 264 if n != ma[f]: |
| 265 if repo.ui.promptchoice( | 265 if repo.ui.promptchoice( |
| 283 f2 = movewithdir[f] | 283 f2 = movewithdir[f] |
| 284 act("local renamed directory to " + f2, "d", None, f, f2, | 284 act("local renamed directory to " + f2, "d", None, f, f2, |
| 285 m2.flags(f)) | 285 m2.flags(f)) |
| 286 elif f in copy: | 286 elif f in copy: |
| 287 f2 = copy[f] | 287 f2 = copy[f] |
| 288 if f2 in m2: # rename case 1, A/A,B/A | 288 if f2 in m2: |
| 289 act("remote copied to " + f, "m", | 289 act("remote copied to " + f, "m", |
| 290 f2, f, f, False) | 290 f2, f, f, False) |
| 291 else: # case 3,20 A/B/A | 291 else: |
| 292 act("remote moved to " + f, "m", | 292 act("remote moved to " + f, "m", |
| 293 f2, f, f, True) | 293 f2, f, f, True) |
| 294 elif f not in ma: | 294 elif f not in ma: |
| 295 if (not overwrite | 295 if (not overwrite |
| 296 and _checkunknownfile(repo, p1, p2, f)): | 296 and _checkunknownfile(repo, p1, p2, f)): |