Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 6953:63b5f4c73c98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n: mark strings for translation in Mercurial
author Martin Geisler <mg@daimi.au.dk>
date Sun, 31 Aug 2008 16:12:02 +0200
parents 11229144aa01
children 865c5be0f8df
comparison
equal deleted inserted replaced
6952:3fffba1c87d0 6953:63b5f4c73c98
345 t = mctx.filectx(f2).data() 345 t = mctx.filectx(f2).data()
346 repo.wwrite(fd, t, flags) 346 repo.wwrite(fd, t, flags)
347 updated += 1 347 updated += 1
348 elif m == "dr": # divergent renames 348 elif m == "dr": # divergent renames
349 fl = a[2] 349 fl = a[2]
350 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)
351 for nf in fl: 351 for nf in fl:
352 repo.ui.warn(" %s\n" % nf) 352 repo.ui.warn(" %s\n" % nf)
353 elif m == "e": # exec 353 elif m == "e": # exec
354 flags = a[2] 354 flags = a[2]
355 util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags) 355 util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags)