equal
deleted
inserted
replaced
40 exchange, |
40 exchange, |
41 hg, |
41 hg, |
42 lock as lockmod, |
42 lock as lockmod, |
43 mdiff, |
43 mdiff, |
44 merge, |
44 merge, |
|
45 mergestate as mergestatemod, |
45 node as nodemod, |
46 node as nodemod, |
46 patch, |
47 patch, |
47 phases, |
48 phases, |
48 pycompat, |
49 pycompat, |
49 repair, |
50 repair, |
799 # parent, second is the temporary "fake" commit we're unshelving. |
800 # parent, second is the temporary "fake" commit we're unshelving. |
800 interactive = state.interactive |
801 interactive = state.interactive |
801 basename = state.name |
802 basename = state.name |
802 with repo.lock(): |
803 with repo.lock(): |
803 checkparents(repo, state) |
804 checkparents(repo, state) |
804 ms = merge.mergestate.read(repo) |
805 ms = mergestatemod.mergestate.read(repo) |
805 if list(ms.unresolved()): |
806 if list(ms.unresolved()): |
806 raise error.Abort( |
807 raise error.Abort( |
807 _(b"unresolved conflicts, can't continue"), |
808 _(b"unresolved conflicts, can't continue"), |
808 hint=_(b"see 'hg resolve', then 'hg unshelve --continue'"), |
809 hint=_(b"see 'hg resolve', then 'hg unshelve --continue'"), |
809 ) |
810 ) |