Bug 3400 - rollback doesn't restore graft state
Summary: rollback doesn't restore graft state
Status: RESOLVED ARCHIVED
Alias: None
Product: Mercurial
Classification: Unclassified
Component: Mercurial (show other bugs)
Version: unspecified
Hardware: All All
: normal bug
Assignee: Bugzilla
URL:
Keywords: easy
Depends on:
Blocks:
 
Reported: 2012-04-25 09:36 UTC by Antoine Pitrou
Modified: 2015-02-06 01:01 UTC (History)
3 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 Antoine Pitrou 2012-04-25 09:36 UTC 
When you successfully graft a changeset and then call rollback, you can't
graft again:

$ hg graft -c
abandon : no graft state found, can't continue
Comment 1 Pierre-Yves David 2012-04-25 12:09 UTC 
Why do you expect rollback to interact with graft ?

Were you in the middle of a multi changesets graft ?
Comment 2 Antoine Pitrou 2012-04-25 12:18 UTC 
> Why do you expect rollback to interact with graft ?

When invoked on a merge, rollback is able to restore the merge state so
that you can commit the merge again.
I would expect similar behaviour from graft: when rolling back a graft,
being able to finish the graft again.

> Were you in the middle of a multi changesets graft ?

No, I was grafting a single changeset.
Comment 3 Bugzilla 2012-05-12 09:30 UTC 

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

This bug was previously known as _bug_ 3399 at http://mercurial.selenic.com/bts/issue3399
Comment 4 Pierre-Yves David 2012-11-26 22:10 UTC 
Adding the graft state file to the transaction journal should do the trick.
Comment 5 Bugzilla 2015-02-06 01:01 UTC 
Bug was inactive for 801 days, archiving