equal
deleted
inserted
replaced
1542 if branchmerge: |
1542 if branchmerge: |
1543 if pas == [p2]: |
1543 if pas == [p2]: |
1544 raise error.Abort(_("merging with a working directory ancestor" |
1544 raise error.Abort(_("merging with a working directory ancestor" |
1545 " has no effect")) |
1545 " has no effect")) |
1546 elif pas == [p1]: |
1546 elif pas == [p1]: |
1547 if not mergeancestor and p1.branch() == p2.branch(): |
1547 if not mergeancestor and wc.branch() == p2.branch(): |
1548 raise error.Abort(_("nothing to merge"), |
1548 raise error.Abort(_("nothing to merge"), |
1549 hint=_("use 'hg update' " |
1549 hint=_("use 'hg update' " |
1550 "or check 'hg heads'")) |
1550 "or check 'hg heads'")) |
1551 if not force and (wc.files() or wc.deleted()): |
1551 if not force and (wc.files() or wc.deleted()): |
1552 raise error.Abort(_("uncommitted changes"), |
1552 raise error.Abort(_("uncommitted changes"), |