[PATCH 5 of 5 STABLE V2] bookmarks: move active bookmark forward upon rebase (issue3813) (BC)

Kevin Bullock kbullock+mercurial at ringworld.org
Wed May 1 16:54:13 CDT 2013


On May 1, 2013, at 4:05 PM, Sean Farley wrote:

> # HG changeset patch
> # User Sean Farley <sean.michael.farley at gmail.com>
> # Date 1367440183 18000
> #      Wed May 01 15:29:43 2013 -0500
> # Branch stable
> # Node ID 7b2dacd764a45bcb7e6f710f483ea38504b0f2e0
> # Parent  1d0fc3f943c59b8cc170d3d6dcd9c7429fc3b6bd
> bookmarks: move active bookmark forward upon rebase (issue3813) (BC)
> 
> Before this patch, when rebasing another bookmark on top of the active
> bookmark, the active bookmark would be deactivated. Now, the active bookmark is
> advanced to the tip of the rebase. Test cases have been updated accordingly.

You're assuming the active bookmark is on the tip of the branch being rebased. If you read issue3813 more closely you'll note that in my case, the active bookmark is further back -- _not_ at a head.

With this change, my bookmark stays active, which is a slight improvement -- but it advances to the head of the newly-rebased branch, which is bad.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock



More information about the Mercurial-devel mailing list