Bug 3220 - graft should allow "regrafting" ancestors with --force
Summary: graft should allow "regrafting" ancestors with --force
Status: RESOLVED FIXED
Alias: None
Product: Mercurial
Classification: Unclassified
Component: Mercurial (show other bugs)
Version: unspecified
Hardware: All All
: normal feature
Assignee: Siddharth Agarwal
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-01-25 10:27 UTC by Matt Oswald
Modified: 2014-09-04 13:48 UTC (History)
5 users (show)

See Also:
Python Version: ---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Matt Oswald 2012-01-25 10:27 UTC 
I want to graft an ancestor revision to the tip, because that one revision 
is the only thing that we want to keep from an old branch that got merged 
into the mainline and then that merge was backed out.

@ tip
|
|
0 backout merge
|
|
0 merge that shouldn't have happened
|\
| \
| |
0 | other revision
| 0 interesting revision on "bad" branch
Comment 1 Matt Mackall 2012-01-25 17:25 UTC 
Seems reasonable.
Comment 2 Bugzilla 2012-05-12 09:27 UTC 

--- Bug imported by bugzilla@serpentine.com 2012-05-12 09:27 EDT  ---

This bug was previously known as _bug_ 3219 at http://mercurial.selenic.com/bts/issue3219
Comment 3 Matt Mackall 2014-07-25 17:23 UTC 
Bulk close: no activity for >2 years -> WONTFIX
Comment 4 Siddharth Agarwal 2014-07-25 21:20 UTC 
I have a patch ready for this after the freeze ends.
Comment 5 HG Bot 2014-08-04 15:45 UTC 
Fixed by http://selenic.com/repo/hg/rev/c2863cfe8a8a
Siddharth Agarwal <sid0@fb.com>
graft: allow regrafting ancestors with --force (issue3220)

(please test the fix)
Comment 6 HG Bot 2014-08-04 15:45 UTC 
Fixed by http://selenic.com/repo/hg/rev/f4e5753745e9
Siddharth Agarwal <sid0@fb.com>
graft: make --force apply across continues (issue3220)

Since --force determines the list of revisions to be grafted, it doesn't really
make sense for users to have to keep typing --force --continue as they continue
grafting.

(please test the fix)