equal
deleted
inserted
replaced
26 bookmarks, |
26 bookmarks, |
27 branchmap, |
27 branchmap, |
28 bundle2, |
28 bundle2, |
29 changegroup, |
29 changegroup, |
30 changelog, |
30 changelog, |
31 cmdutil, |
|
32 context, |
31 context, |
33 dirstate, |
32 dirstate, |
34 dirstateguard, |
33 dirstateguard, |
35 encoding, |
34 encoding, |
36 error, |
35 error, |
40 hook, |
39 hook, |
41 lock as lockmod, |
40 lock as lockmod, |
42 manifest, |
41 manifest, |
43 match as matchmod, |
42 match as matchmod, |
44 merge as mergemod, |
43 merge as mergemod, |
|
44 mergeutil, |
45 namespaces, |
45 namespaces, |
46 obsolete, |
46 obsolete, |
47 pathutil, |
47 pathutil, |
48 peer, |
48 peer, |
49 phases, |
49 phases, |
1628 |
1628 |
1629 if merge and cctx.deleted(): |
1629 if merge and cctx.deleted(): |
1630 raise error.Abort(_("cannot commit merge with missing files")) |
1630 raise error.Abort(_("cannot commit merge with missing files")) |
1631 |
1631 |
1632 ms = mergemod.mergestate.read(self) |
1632 ms = mergemod.mergestate.read(self) |
1633 cmdutil.checkunresolved(ms) |
1633 mergeutil.checkunresolved(ms) |
1634 |
1634 |
1635 if editor: |
1635 if editor: |
1636 cctx._text = editor(self, cctx, subs) |
1636 cctx._text = editor(self, cctx, subs) |
1637 edited = (text != cctx._text) |
1637 edited = (text != cctx._text) |
1638 |
1638 |