Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 4681:dc5920ea12f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix small bug with a failed merge across a rename If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy f to fd, and util.set_exec wouldn't find the file.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 22 Jun 2007 20:44:40 -0300
parents 723e0ddb6ada
children 8808ea7da86b
comparison
equal deleted inserted replaced
4680:059bdc8dfb9d 4681:dc5920ea12f8
399 else: 399 else:
400 if r is None: 400 if r is None:
401 updated += 1 401 updated += 1
402 else: 402 else:
403 merged += 1 403 merged += 1
404 if f != fd: 404 if f != fd:
405 repo.ui.debug(_("copying %s to %s\n") % (f, fd)) 405 repo.ui.debug(_("copying %s to %s\n") % (f, fd))
406 repo.wwrite(fd, repo.wread(f), flags) 406 repo.wwrite(fd, repo.wread(f), flags)
407 if move: 407 if move:
408 repo.ui.debug(_("removing %s\n") % f) 408 repo.ui.debug(_("removing %s\n") % f)
409 os.unlink(repo.wjoin(f)) 409 os.unlink(repo.wjoin(f))
410 util.set_exec(repo.wjoin(fd), "x" in flags) 410 util.set_exec(repo.wjoin(fd), "x" in flags)
411 elif m == "g": # get 411 elif m == "g": # get
412 flags = a[2] 412 flags = a[2]
413 repo.ui.note(_("getting %s\n") % f) 413 repo.ui.note(_("getting %s\n") % f)
414 t = mctx.filectx(f).data() 414 t = mctx.filectx(f).data()