[issue2753] Merging from a bookmark into a different branch moves the (non-current) bookmark

[mcajfx]

New submission from mcajfx <londonjf at yahoo.co.uk>:

Summary: we want to merge a version from one branch to another, the version
being indicated by a bookmark. Observed behaviour is that the bookmark moves
to the new CS, even though it is not current and "track.current = True" is
given under bookmarks.

Setup: Create a blank repo and unbundle attached problem.bundle. do "hg
bookmark -r 2 foo" to bookmark second repo. For a check, hg log -r foo
should give:

changeset:   2:f572aa177abf
bookmark:    foo
tag:         tip
parent:      0:cc0b0c0ee782
user:        foobar
date:        Tue Apr 05 19:52:36 2011 +0100
summary:     Create branch foo


Now do:

hg update -r extra

hg merge -r foo

This merges foo into extra.

_Expected Behaviour_

Merge occurs, new CS is member of branch extra, bookmark latest still points
at CS 2.

_Observed Behaviour_

Merge occurs, new CS is member of branch extra, bookmark latest now points
at new CS 3.

----------
files: problem.bundle
messages: 15968
nosy: mcajfx
priority: bug
status: unread
title: Merging from a bookmark into a different branch moves the (non-current) bookmark
topic: bookmarks

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2753>
____________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: problem.bundle
Type: application/octet-stream
Size: 758 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20110405/a8e5ddb3/attachment.obj>