equal
deleted
inserted
replaced
1929 if not mergeancestor and wc.branch() == p2.branch(): |
1929 if not mergeancestor and wc.branch() == p2.branch(): |
1930 msg = _(b"nothing to merge") |
1930 msg = _(b"nothing to merge") |
1931 hint = _(b"use 'hg update' or check 'hg heads'") |
1931 hint = _(b"use 'hg update' or check 'hg heads'") |
1932 raise error.Abort(msg, hint=hint) |
1932 raise error.Abort(msg, hint=hint) |
1933 if not force and (wc.files() or wc.deleted()): |
1933 if not force and (wc.files() or wc.deleted()): |
1934 raise error.StateError( |
1934 msg = _(b"uncommitted changes") |
1935 _(b"uncommitted changes"), |
1935 hint = _(b"use 'hg status' to list changes") |
1936 hint=_(b"use 'hg status' to list changes"), |
1936 raise error.StateError(msg, hint=hint) |
1937 ) |
|
1938 if not wc.isinmemory(): |
1937 if not wc.isinmemory(): |
1939 for s in sorted(wc.substate): |
1938 for s in sorted(wc.substate): |
1940 wc.sub(s).bailifchanged() |
1939 wc.sub(s).bailifchanged() |
1941 |
1940 |
1942 elif not overwrite: |
1941 elif not overwrite: |