equal
deleted
inserted
replaced
779 commit = files |
779 commit = files |
780 |
780 |
781 if use_dirstate: |
781 if use_dirstate: |
782 p1, p2 = self.dirstate.parents() |
782 p1, p2 = self.dirstate.parents() |
783 update_dirstate = True |
783 update_dirstate = True |
|
784 |
|
785 if (not force and p2 != nullid and |
|
786 (files or match != util.always)): |
|
787 raise util.Abort(_('cannot partially commit a merge ' |
|
788 '(do not specify files or patterns)')) |
784 else: |
789 else: |
785 p1, p2 = p1, p2 or nullid |
790 p1, p2 = p1, p2 or nullid |
786 update_dirstate = (self.dirstate.parents()[0] == p1) |
791 update_dirstate = (self.dirstate.parents()[0] == p1) |
787 |
792 |
788 c1 = self.changelog.read(p1) |
793 c1 = self.changelog.read(p1) |