##// END OF EJS Templates
merge: break up a not-so-one-liner for readability...
marmoute -
r49554:bca57b01 default
parent child Browse files
Show More
@@ -1927,10 +1927,9 b' def _update('
1927 raise error.Abort(m_a)
1927 raise error.Abort(m_a)
1928 elif pas == [p1]:
1928 elif pas == [p1]:
1929 if not mergeancestor and wc.branch() == p2.branch():
1929 if not mergeancestor and wc.branch() == p2.branch():
1930 raise error.Abort(
1930 msg = _(b"nothing to merge")
1931 _(b"nothing to merge"),
1931 hint = _(b"use 'hg update' or check 'hg heads'")
1932 hint=_(b"use 'hg update' or check 'hg heads'"),
1932 raise error.Abort(msg, hint=hint)
1933 )
1934 if not force and (wc.files() or wc.deleted()):
1933 if not force and (wc.files() or wc.deleted()):
1935 raise error.StateError(
1934 raise error.StateError(
1936 _(b"uncommitted changes"),
1935 _(b"uncommitted changes"),
General Comments 0
You need to be logged in to leave comments. Login now