[Bug 5838] New: Interrupted rebase recovery instructions are wrong

mercurial-bugs at mercurial-scm.org mercurial-bugs at mercurial-scm.org
Thu Apr 12 10:36:31 UTC 2018


https://bz.mercurial-scm.org/show_bug.cgi?id=5838

            Bug ID: 5838
           Summary: Interrupted rebase recovery instructions are wrong
           Product: Mercurial
           Version: 4.5.2
          Hardware: All
                OS: All
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: rebase
          Assignee: bugzilla at mercurial-scm.org
          Reporter: matt_harbison at yahoo.com
                CC: mercurial-devel at mercurial-scm.org

I hit this on Windows a few weeks ago in the hg repo, when rebase aborted
because a file was open.  The transcript below is from Linux with a rebase that
aborted because a subrepo wasn't available.

# The parent repo is fully present, but the subrepo revision used in tip is
not.
# For whatever reason, the *.local style hostnames aren't working on this
system
# now, and that's what is in paths.default.

$ hg rebase -b . -d tip
rebasing 19929:ff68cd4fe339 "..."
abort: error: Name or service not known

# Oops.  Override the path and try again.
$ hg rebase -b . -d tip --config paths.default=http://matt7h-pc:8000
abort: last update was interrupted
(use 'hg update' to get a consistent checkout)

# No flavor of update does anything useful.
$ hg up .
abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort')
$ hg up -C .
abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort')

$ hg version
Mercurial Distributed SCM (version 4.5.2+2-9639c433be54)
(see https://mercurial-scm.org for more information)

-- 
You are receiving this mail because:
You are on the CC list for the bug.


More information about the Mercurial-devel mailing list