[issue1860] rebasing merge changeset makes changes disappear (in crew repo)

[Christian Ebert]

New submission from Christian Ebert <blacktrash at gmx.net>:

The following csets have "disappeared" from crew:

3b283adcc720
552c5a5a3502
cec9fb4e07a1
1f54b1b7122f

As far as I understand it, this happened because of a rebase/merge against
the wrong parent in:

c655432c2c24

As this happened almost unnoticed, and imho is difficult to detect, I
believe rebase should have some safeguarding/warning mechanism against such
cases.

See

http://hg.intevation.org/beta/mercurial/crew/graph/1214c64c592b

for a graph.

The lost changes can be recovered by doing:

hg backout --merge c655432c2c24 --parent 1f54b1b7122f

hg revert hgext/win32mbcs.py to latest version
hg ci

See http://www.blacktrash.org/hg/hgexptl/

----------
messages: 10700
nosy: blacktrash, mg
priority: bug
status: unread
title: rebasing merge changeset makes changes disappear (in crew repo)
topic: rebase

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue1860>
____________________________________________________