[issue2728] inconsistency between bookmarks set with and without -r

[Wagner Bruna]

New submission from Wagner Bruna <wagner.bruna+mercurial at gmail.com>:

On merge revisions, a bookmark set from another revision doesn't move; a
bookmark set on the current working parent does:

#!/bin/bash
hg init t
cd t
hg -q branch ancestor
hg -q ci -m ancestor
hg -q branch local
hg -q ci -m local
hg -q up ancestor
hg -q branch other
hg -q ci -m other

if [ "$1" == "bug" ] ; then
  hg bookmark btest
  hg -q up -C local
else
  hg -q up -C local
  hg bookmark -r other btest 
fi

hg -q merge btest
hg glog --template '{branches} {bookmarks}\n'

hg -q branch merge1
hg -q ci -m 'merge1' 
hg glog --template '{branches} {bookmarks}\n'

Results:

$ ./test-bookmark-merge.sh bug

@  other btest
|
| @  local
|/
o  ancestor

@    merge1 btest
|\
| o  other
| |
o |  local
|/
o  ancestor

$ ./test-bookmark-merge.sh

@  other btest
|
| @  local
|/
o  ancestor

@    merge1
|\
| o  other btest
| |
o |  local
|/
o  ancestor

hg is 1.8.1+48-913c2c66a555. The "correct" merge behavior is discussed on
issue1887 .

----------
messages: 15828
nosy: wbruna
priority: bug
status: unread
title: inconsistency between bookmarks set with and without -r

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2728>
____________________________________________________