Bug 4015 - Moving a bookmark to the successor of an obsolete change shouldn't require --force
Summary: Moving a bookmark to the successor of an obsolete change shouldn't require --...
Status: RESOLVED FIXED
Alias: None
Product: Mercurial
Classification: Unclassified
Component: evolution (show other bugs)
Version: unspecified
Hardware: PC Mac OS
: normal bug
Assignee: Bugzilla
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-08-09 19:45 UTC by Augie Fackler
Modified: 2014-01-06 10:49 UTC (History)
3 users (show)

See Also:
Python Version: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Augie Fackler 2013-08-09 19:45 UTC
I pulled a revised version of some changes from smf, and when I did so I had to use --force to move @ to the revision I got from him.

I think that when advancing a bookmark, the set successors($MARKED_REV):: should be valid without force.
Comment 1 Kevin Bullock 2013-08-13 23:46 UTC
I agree.
Comment 2 HG Bot 2013-11-25 17:30 UTC
Fixed by http://selenic.com/repo/hg/rev/2ca325ea57fa
Sean Farley <sean.michael.farley@gmail.com>
bookmarks: consider successor changesets when moving bookmark (issue4015)

Previously, this required -f because we didn't consider obsolete changesets
(and their children ... or successors of those children, etc.). We now use
obsolete.foreground to calculate acceptable changesets when advancing the
bookmark.

Test coverage has been added.

(please test the fix)