catastrophic strip

Georges Racinet georges.racinet at octobus.net
Wed Jul 21 10:37:52 UTC 2021


On 7/21/21 11:17 AM, Uwe Brauer wrote:
> I just accidently striped a branch that contains my work over the last past 6 month. When I try to pull it back
>
> hg pull 89d30b14c3e1-dada9bf7-backup.hg
> pulling from 89d30b14c3e1-dada9bf7-backup.hg
>
> I obtain. 
>
> abort: 00changelog.i at bfc61958f26e: unknown parent!

`hg strip` normally keeps a backup inside the repo, to be restored with
`hg unbundle` (there's a setting to disable it, though, if I remember
correctly).

Do you have it ?

Here's an example:

    /tmp/teststrip $ hg log
    changeset:   1:654eabbbc66a
    tag:         tip
    user:        Georges Racinet <georges.racinet at octobus.net>
    date:        Wed Jul 21 12:30:33 2021 +0200
    summary:     foo2

    changeset:   0:ef0b809416af
    user:        Georges Racinet <georges.racinet at octobus.net>
    date:        Wed Jul 21 12:30:28 2021 +0200
    summary:     foo

    /tmp/teststrip $ hg strip -r 654eabbbc66a
    saved backup bundle to
    /tmp/teststrip/.hg/strip-backup/654eabbbc66a-caa0b8b0-backup.hg
    /tmp/teststrip $ hg log -r 654eabbbc66a
    abort: unknown revision '654eabbbc66a'  # yes it's been stripped

Now restoring (I suggest you make a full copy of the entire repo,
including those backups, before anything else).

    /tmp/teststrip $ hg unbundle
    /tmp/teststrip/.hg/strip-backup/654eabbbc66a-caa0b8b0-backup.hg

    adding changesets
    adding manifests
    adding file changes
    added 1 changesets with 1 changes to 1 files
    new changesets 654eabbbc66a (1 drafts)
    (run 'hg update' to get a working copy)
    /tmp/teststrip $ hg log -r 654eabbbc66a
    changeset:   1:654eabbbc66a
    tag:         tip
    user:        Georges Racinet <georges.racinet at octobus.net>
    date:        Wed Jul 21 12:30:33 2021 +0200
    summary:     foo2

-- 
Georges Racinet
https://octobus.net, https://about.heptapod.host, https://heptapod.net
GPG: BF5456F4DC625443849B6E58EE20CA44EF691D39, sur serveurs publics

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20210721/f6480b45/attachment-0002.html>


More information about the Mercurial mailing list