| No Linters Available |
| No Unit Test Coverage |
Queued, thanks. I got a fuzz 1 (offset 0 lines) message when I applied the first one, so please double check it.
In D9509#142943, @mharbison72 wrote:Queued, thanks. I got a fuzz 1 (offset 0 lines) message when I applied the first one, so please double check it.
Looks good, thanks.
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/rebase.py (7 lines) | |||
| M | tests/test-rebase-inmemory.t (6 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 61c1f29e7f4f | d767f71b9158 | Martin von Zweigbergk | Dec 2 2020, 6:39 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | spectral | ||
| Closed | spectral | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | spectral | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| # so the entire rebase operation is retried. | # so the entire rebase operation is retried. | ||||
| raise | raise | ||||
| ui.status( | ui.status( | ||||
| _( | _( | ||||
| b"hit merge conflicts; rebasing that " | b"hit merge conflicts; rebasing that " | ||||
| b"commit again in the working copy\n" | b"commit again in the working copy\n" | ||||
| ) | ) | ||||
| ) | ) | ||||
| try: | |||||
| cmdutil.bailifchanged(repo) | cmdutil.bailifchanged(repo) | ||||
| except error.Abort: | |||||
| clearstatus(repo) | |||||
| clearcollapsemsg(repo) | |||||
| raise | |||||
| self.inmemory = False | self.inmemory = False | ||||
| self._assignworkingcopy() | self._assignworkingcopy() | ||||
| mergemod.update(repo[p1], wc=self.wctx) | mergemod.update(repo[p1], wc=self.wctx) | ||||
| rebasenode( | rebasenode( | ||||
| repo, | repo, | ||||
| rev, | rev, | ||||
| p1, | p1, | ||||
| p2, | p2, | ||||
| transaction abort! | transaction abort! | ||||
| rollback completed | rollback completed | ||||
| abort: uncommitted changes | abort: uncommitted changes | ||||
| [20] | [20] | ||||
| $ cat a | $ cat a | ||||
| dirty | dirty | ||||
| $ hg status -v | $ hg status -v | ||||
| M a | M a | ||||
| # The repository is in an unfinished *rebase* state. | |||||
| # To continue: hg rebase --continue | |||||
| # To abort: hg rebase --abort | |||||
| # To stop: hg rebase --stop | |||||
| Retrying without in-memory merge won't lose merge state | Retrying without in-memory merge won't lose merge state | ||||
| $ cd .. | $ cd .. | ||||
| $ hg clone repo3 repo3-merge-state -q | $ hg clone repo3 repo3-merge-state -q | ||||
| $ cd repo3-merge-state | $ cd repo3-merge-state | ||||
| $ hg merge 4 | $ hg merge 4 | ||||
| merging e | merging e | ||||
| warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | ||||