Mercurial > hg
comparison mercurial/merge.py @ 6884:11229144aa01
merge with crew-stable
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Tue, 12 Aug 2008 17:47:08 +0200 |
| parents | 482581431dcd 1d38f3605b20 |
| children | 63b5f4c73c98 |
comparison
equal
deleted
inserted
replaced
| 6876:077f1e637cd8 | 6884:11229144aa01 |
|---|---|
| 321 else: | 321 else: |
| 322 if r is None: | 322 if r is None: |
| 323 updated += 1 | 323 updated += 1 |
| 324 else: | 324 else: |
| 325 merged += 1 | 325 merged += 1 |
| 326 util.set_flags(repo.wjoin(fd), 'l' in flags, 'x' in flags) | |
| 327 if f != fd and move and util.lexists(repo.wjoin(f)): | |
| 328 repo.ui.debug(_("removing %s\n") % f) | |
| 329 os.unlink(repo.wjoin(f)) | |
| 326 elif m == "g": # get | 330 elif m == "g": # get |
| 327 flags = a[2] | 331 flags = a[2] |
| 328 repo.ui.note(_("getting %s\n") % f) | 332 repo.ui.note(_("getting %s\n") % f) |
| 329 t = mctx.filectx(f).data() | 333 t = mctx.filectx(f).data() |
| 330 repo.wwrite(f, t, flags) | 334 repo.wwrite(f, t, flags) |
| 346 repo.ui.warn("warning: detected divergent renames of %s to:\n" % f) | 350 repo.ui.warn("warning: detected divergent renames of %s to:\n" % f) |
| 347 for nf in fl: | 351 for nf in fl: |
| 348 repo.ui.warn(" %s\n" % nf) | 352 repo.ui.warn(" %s\n" % nf) |
| 349 elif m == "e": # exec | 353 elif m == "e": # exec |
| 350 flags = a[2] | 354 flags = a[2] |
| 351 util.set_flags(repo.wjoin(f), flags) | 355 util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags) |
| 352 | 356 |
| 353 return updated, merged, removed, unresolved | 357 return updated, merged, removed, unresolved |
| 354 | 358 |
| 355 def recordupdates(repo, action, branchmerge): | 359 def recordupdates(repo, action, branchmerge): |
| 356 "record merge actions to the dirstate" | 360 "record merge actions to the dirstate" |