Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 6381:0b89315d5de2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix missing space in one of the new update messages.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 24 Mar 2008 20:28:13 +0100
parents cdc458b12f0f
children 2d9328a2f81f
comparison
equal deleted inserted replaced
6380:a632a9a57821 6381:0b89315d5de2
371 pass # all good 371 pass # all good
372 elif p1.branch() == p2.branch(): 372 elif p1.branch() == p2.branch():
373 if wc.files() or wc.deleted(): 373 if wc.files() or wc.deleted():
374 raise util.Abort(_("crosses branches (use 'hg merge' or " 374 raise util.Abort(_("crosses branches (use 'hg merge' or "
375 "'hg update -C' to discard changes)")) 375 "'hg update -C' to discard changes)"))
376 raise util.Abort(_("crosses branches (use 'hg merge'" 376 raise util.Abort(_("crosses branches (use 'hg merge' "
377 "or 'hg update -C')")) 377 "or 'hg update -C')"))
378 elif wc.files() or wc.deleted(): 378 elif wc.files() or wc.deleted():
379 raise util.Abort(_("crosses named branches (use " 379 raise util.Abort(_("crosses named branches (use "
380 "'hg update -C' to discard changes)")) 380 "'hg update -C' to discard changes)"))
381 else: 381 else: