Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/merge.py @ 22841:18b3869179f9
merge: make error message consistent with other commands
If a merge is attempted when another merge is already ongoing, we give
the message "outstanding uncommitted merges". Many other commands
(such as backout, rebase, histedit) give the same message in singular
form. Since the singular form also seems to make more sense, let's use
that for 'hg merge' as well.
| author | Martin von Zweigbergk <martinvonz@gmail.com> |
|---|---|
| date | Wed, 08 Oct 2014 14:16:53 -0700 |
| parents | 7a06ad9518c0 |
| children | ce0592328d68 |
comparison
equal
deleted
inserted
replaced
| 22840:ba5c635921e1 | 22841:18b3869179f9 |
|---|---|
| 1056 | 1056 |
| 1057 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) | 1057 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) |
| 1058 | 1058 |
| 1059 ### check phase | 1059 ### check phase |
| 1060 if not overwrite and len(pl) > 1: | 1060 if not overwrite and len(pl) > 1: |
| 1061 raise util.Abort(_("outstanding uncommitted merges")) | 1061 raise util.Abort(_("outstanding uncommitted merge")) |
| 1062 if branchmerge: | 1062 if branchmerge: |
| 1063 if pas == [p2]: | 1063 if pas == [p2]: |
| 1064 raise util.Abort(_("merging with a working directory ancestor" | 1064 raise util.Abort(_("merging with a working directory ancestor" |
| 1065 " has no effect")) | 1065 " has no effect")) |
| 1066 elif pas == [p1]: | 1066 elif pas == [p1]: |