163 if len(repo.parents()) == 2: |
163 if len(repo.parents()) == 2: |
164 repo.ui.debug('resuming interrupted rebase\n') |
164 repo.ui.debug('resuming interrupted rebase\n') |
165 else: |
165 else: |
166 stats = rebasenode(repo, rev, p1, p2, state) |
166 stats = rebasenode(repo, rev, p1, p2, state) |
167 if stats and stats[3] > 0: |
167 if stats and stats[3] > 0: |
168 raise util.Abort(_('fix unresolved conflicts with hg ' |
168 raise util.Abort(_('unresolved conflicts (see hg ' |
169 'resolve then run hg rebase --continue')) |
169 'resolve, then hg rebase --continue)')) |
170 updatedirstate(repo, rev, target, p2) |
170 updatedirstate(repo, rev, target, p2) |
171 if not collapsef: |
171 if not collapsef: |
172 newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn) |
172 newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn) |
173 else: |
173 else: |
174 # Skip commit if we are collapsing |
174 # Skip commit if we are collapsing |