[issue2382] pull --rebase aborts: cannot delete revision N above applied patches

Dan Villiom Podlaski Christiansen bugs at mercurial.selenic.com
Thu Sep 16 13:56:23 UTC 2010


New submission from Dan Villiom Podlaski Christiansen <danchr at gmail.com>:

Assume a user sends a series of three patches to a list. The reviewer then 
accepts patch #1 and #3, but rejects #2. These changes are then pushed to 
the public repository. Prior to this, the user's clone was fully up-to-date. 
In order to update his clone, the user then does a ‘pull --rebase’ with his 
patches applied. This will fail, as the rebase will attempt to delete patch 
#2, which has a non-patch child — what used to be patch #3.

It looks like this:

$ hg pull --rebase
…
added X changesets with X changes to X files (+X heads)
abort: cannot delete revision N above applied patches

The attached test reproduces the bug.

Somewhat related to this may be the fact that had the reviewer committed all 
three patches, the user would simply get 'no changes found', and have to 
qfinish the patches himself.

----------
files: test-pull-rebase.t
messages: 13628
nosy: danchr
priority: bug
status: unread
title: pull --rebase aborts: cannot delete revision N above applied patches
topic: mq, rebase

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2382>
____________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: test-pull-rebase.t
Type: application/x-troff
Size: 1399 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20100916/e9ee35b5/attachment.t>


More information about the Mercurial-devel mailing list