https://bz.mercurial-scm.org/show_bug.cgi?id=5084
Bug ID: 5084
Summary: rebase --abort left repository in bad state
Product: Mercurial
Version: 3.7
Hardware: PC
OS: Mac OS
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: rebase
Assignee: bugzilla at selenic.com
Reporter: timeless at gmail.com
CC: mercurial-devel at selenic.com
my mercurial was 01a5143cd25f + some other patches at times
for logs w/ the `@{rev}` stuff, those patches are:
tests: add unix-permissions guards
tests: guard mtime access
(they're in the archives, and they're irrelevant), which means it's effectively
01a5143cd25f.
(py)[timeless at gcc2-power8 TypeScript]$ tail -50 .hg/blackbox.log
2016/02/04 00:49:58 timeless @c745bb2fe5d1 (99448)> bookmarks -q exited 0 after
0.32 seconds
2016/02/04 00:49:58 timeless @c745bb2fe5d1 (99540)> book spelling
2016/02/04 00:49:59 timeless @c745bb2fe5d1 (99540)> book spelling exited 0
after 0.35 seconds
2016/02/04 00:50:08 timeless @c745bb2fe5d1 (105341)> path
2016/02/04 00:50:08 timeless @c745bb2fe5d1 (105341)> path exited 0 after 0.31
seconds
2016/02/04 00:50:10 timeless @c745bb2fe5d1 (106109)> debuglabelcomplete spe
2016/02/04 00:50:10 timeless @c745bb2fe5d1 (106109)> updated served branch
cache in 0.0562 seconds
2016/02/04 00:50:10 timeless @c745bb2fe5d1 (106109)> wrote served branch cache
with 1 labels and 86 nodes
2016/02/04 00:50:11 timeless @c745bb2fe5d1 (106109)> debuglabelcomplete spe
exited 0 after 0.73 seconds
2016/02/04 00:50:12 timeless @c745bb2fe5d1 (107218)> debuglabelcomplete
spelling-f
2016/02/04 00:50:13 timeless @c745bb2fe5d1 (107218)> debuglabelcomplete
spelling-f exited 0 after 0.34 seconds
2016/02/04 00:50:14 timeless @c745bb2fe5d1 (107865)> debuglabelcomplete spe
2016/02/04 00:50:14 timeless @c745bb2fe5d1 (107865)> debuglabelcomplete spe
exited 0 after 0.34 seconds
2016/02/04 00:50:15 timeless @c745bb2fe5d1 (108461)> push -r spelling-full -r
spelling
2016/02/04 00:52:35 timeless @c745bb2fe5d1 (108461)> push -r spelling-full -r
spelling exited 0 after 139.75 seconds
2016/02/04 18:14:02 timeless (87128)> co ignore
2016/02/04 18:14:04 timeless (87128)> co ignore exited 0 after 1.61 seconds
2016/02/04 18:14:14 timeless (87189)> showconfig alias.rm
2016/02/04 18:14:14 timeless (87189)> showconfig alias.rm exited 1 after 0.06
seconds
2016/02/04 18:14:14 timeless (87196)> debugpathcomplete -n tes
2016/02/04 18:14:14 timeless (87196)> debugpathcomplete -n tes exited 0 after
0.12 seconds
2016/02/04 18:14:15 timeless (87205)> rm tests/
2016/02/04 18:14:23 timeless (87205)> rm tests/ exited 0 after 7.93 seconds
2016/02/04 18:14:37 timeless (87239)> commit --amend
2016/02/04 18:14:38 timeless (87239)> updated served branch cache in 0.0161
seconds
2016/02/04 18:14:38 timeless (87239)> wrote served branch cache with 1 labels
and 87 nodes
2016/02/04 18:14:41 timeless (87239)> updated served branch cache in 0.0156
seconds
2016/02/04 18:14:41 timeless (87239)> wrote served branch cache with 1 labels
and 88 nodes
2016/02/04 18:14:41 timeless (87239)> commit --amend exited 0 after 4.24
seconds
2016/02/04 18:17:00 timeless (87438)> rebase -s 12761 -d ignore
2016/02/04 18:17:01 timeless (87438)> updated served branch cache in 0.0572
seconds
2016/02/04 18:17:01 timeless (87438)> wrote served branch cache with 1 labels
and 87 nodes
2016/02/04 18:17:02 timeless (87438)> updated served branch cache in 0.0054
seconds
2016/02/04 18:17:02 timeless (87438)> wrote served branch cache with 1 labels
and 87 nodes
2016/02/04 18:17:03 timeless (87438)> updated served branch cache in 0.0053
seconds
2016/02/04 18:17:03 timeless (87438)> wrote served branch cache with 1 labels
and 87 nodes
2016/02/04 18:18:17 timeless (87438)> rebase -s 12761 -d ignore exited -1 after
76.41 seconds
2016/02/04 18:18:21 timeless (87574)> rebase --abort
2016/02/04 18:18:21 timeless (87574)> saved backup bundle to
/home/timeless/hg/TypeScript/.hg/strip-backup/c4dd7c837e19-7e58fc5e-backup.hg
2016/02/04 18:18:21 timeless (87574)> updated served branch cache in 0.0559
seconds
2016/02/04 18:18:21 timeless (87574)> wrote served branch cache with 1 labels
and 87 nodes
2016/02/04 18:18:21 timeless (87574)> rebase --abort exited 0 after 0.64
seconds
2016/02/04 18:26:17 timeless @000000000000 (88304)> log -G
2016/02/04 18:26:28 timeless @000000000000 (88325)> rebase -s 12761 -d ignore
-t :merge-local
2016/02/04 18:26:29 timeless @000000000000 (88325)> abort: last update was
interrupted
2016/02/04 18:26:29 timeless @000000000000 (88325)> (use 'hg update' to get a
consistent checkout)
2016/02/04 18:26:29 timeless @000000000000 (88325)> rebase -s 12761 -d ignore
-t :merge-local exited -1 after 0.28 seconds
2016/02/04 18:27:24 timeless @None (88423)> log -G
2016/02/04 18:27:37 timeless @None (88446)> id
2016/02/04 18:27:37 timeless @None (88446)> id exited 0 after 0.10 seconds
(py)[timeless at gcc2-power8 TypeScript]$ hg rebase -s 12761 -d ignore
rebasing 12761:45c50870718d "spelling: accessibility"
rebasing 12762:f465ff81d258 "spelling: accessor"
rebasing 12763:4efc732dc211 "spelling: accidentally"
rebasing 12764:78d190130a15 "spelling: across"
note: possible conflict -
tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.js was
deleted and renamed to:
tests/baselines/reference/typeParameterCompatibilityAcrossDeclarations.js
note: possible conflict -
tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.symbols
was deleted and renamed to:
tests/baselines/reference/typeParameterCompatibilityAcrossDeclarations.symbols
note: possible conflict -
tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.types
was deleted and renamed to:
tests/baselines/reference/typeParameterCompatibilityAcrossDeclarations.types
note: possible conflict -
tests/cases/compiler/typeParameterCompatibilityAccrossDeclarations.ts was
deleted and renamed to:
tests/cases/compiler/typeParameterCompatibilityAcrossDeclarations.ts
remote changed tests/cases/fourslash/goToDefinitionLabels.ts which local
deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? interrupted!
(py)[timeless at gcc2-power8 TypeScript]$ hg rebase --abort
saved backup bundle to
/home/timeless/hg/TypeScript/.hg/strip-backup/c4dd7c837e19-7e58fc5e-backup.hg
warning: ignoring unknown working parent 7810272e207e!
rebase aborted
(py)[timeless at gcc2-power8 TypeScript]$ hg log -G
warning: ignoring unknown working parent 7810272e207e!
o changeset: 13010:ebfe90cb4730
| bookmark: ignore
| tag: tip
| parent: 12752:7ff79b962ff0
| user: Josh Soref <jsoref at users.noreply.github.com>
| date: Tue Feb 02 21:41:49 2016 +0000
| summary: ignore
(py)[timeless at gcc2-power8 TypeScript]$ hg rebase -s 12761 -d ignore -t
:merge-local
warning: ignoring unknown working parent 7810272e207e!
abort: last update was interrupted
(use 'hg update' to get a consistent checkout)
(py)[timeless at gcc2-power8 TypeScript]$ hg id
warning: ignoring unknown working parent 7810272e207e!
000000000000
(py)[timeless at gcc2-power8 TypeScript]$ hg id --debugger
--
You are receiving this mail because:
You are on the CC list for the bug.