[Bug 5487] New: Cannot restore merge commit after rebase
mercurial-bugs at mercurial-scm.org
mercurial-bugs at mercurial-scm.org
Thu Feb 16 04:54:53 UTC 2017
https://bz.mercurial-scm.org/show_bug.cgi?id=5487
Bug ID: 5487
Summary: Cannot restore merge commit after rebase
Product: Mercurial
Version: 4.0.2
Hardware: PC
OS: Windows
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: evolution
Assignee: bugzilla at mercurial-scm.org
Reporter: abcz2.uprola at gmail.com
CC: mercurial-devel at selenic.com,
pierre-yves.david at ens-lyon.org
I've done a rebase of a merge commit. I was not satisfied with it, so I'd like
to restore previous version and strip current. But I have evolution enabled, so
no backup was generated.
Here is my changeset
$ hg.exe --hidden log -r "obsolete()"
changeset: 4433:05cee9113122
parent: 4427:f16ee9507a9b
parent: 4432:4d1ecbeabed5
user: danbst
date: Thu Feb 16 06:29:11 2017 +0200
summary: Merge with release-test
When I try to recover it (using hg touch), I get:
$ hg.exe --hidden touch -r 4433
[4433] Merge with release-test
reviving this changeset will create divergence unless you make a duplicate.
(a)llow divergence or (d)uplicate the changeset? a
abort: cannot amend merge changesets
But if I try duplicate:
$ hg.exe --hidden touch -D -r 4433
abort: cannot amend merge changesets
So, no way to recover it, and no backups
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list