##// END OF EJS Templates
merge: make error message consistent with other commands...
Martin von Zweigbergk -
r22841:18b38691 default
parent child Browse files
Show More
@@ -1058,7 +1058,7 b' def update(repo, node, branchmerge, forc'
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"
@@ -1705,7 +1705,7 b' Test status after merging with a branch '
1705 - make sure update of merge with removed largefiles fails as expected
1705 - make sure update of merge with removed largefiles fails as expected
1706 $ hg rm sub2/large6
1706 $ hg rm sub2/large6
1707 $ hg up -r.
1707 $ hg up -r.
1708 abort: outstanding uncommitted merges
1708 abort: outstanding uncommitted merge
1709 [255]
1709 [255]
1710
1710
1711 - revert should be able to revert files introduced in a pending merge
1711 - revert should be able to revert files introduced in a pending merge
General Comments 0
You need to be logged in to leave comments. Login now