Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 19802:94c394653b2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: standardize error message for dirty working dir
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 20:50:51 -0700
parents 41abe2e3e3b7
children 0f64af33fb63
comparison
equal deleted inserted replaced
19801:41abe2e3e3b7 19802:94c394653b2a
709 if not mergeancestor and p1.branch() == p2.branch(): 709 if not mergeancestor and p1.branch() == p2.branch():
710 raise util.Abort(_("nothing to merge"), 710 raise util.Abort(_("nothing to merge"),
711 hint=_("use 'hg update' " 711 hint=_("use 'hg update' "
712 "or check 'hg heads'")) 712 "or check 'hg heads'"))
713 if not force and (wc.files() or wc.deleted()): 713 if not force and (wc.files() or wc.deleted()):
714 raise util.Abort(_("outstanding uncommitted changes"), 714 raise util.Abort(_("uncommitted changes"),
715 hint=_("use 'hg status' to list changes")) 715 hint=_("use 'hg status' to list changes"))
716 for s in sorted(wc.substate): 716 for s in sorted(wc.substate):
717 if wc.sub(s).dirty(): 717 if wc.sub(s).dirty():
718 raise util.Abort(_("outstanding uncommitted changes in " 718 raise util.Abort(_("outstanding uncommitted changes in "
719 "subrepository '%s'") % s) 719 "subrepository '%s'") % s)