[issue2720] pull moves boo, but not after head creation
Steffen Daode Nurpmeso
bugs at mercurial.selenic.com
Wed Mar 23 13:18:59 UTC 2011
New submission from Steffen Daode Nurpmeso <sdaoden at gmail.com>:
You need the parentrevspec extension for this to work
(i'm too silly for the other stuff - *really*: one look
at the docu and i was gone, so...; replace the "^" in
the lonely line otherwise, please)!
cd $TMPDIR; \
mkdir -p t/r1; cd t/r1; hg init; \
echo F1 > F1; hg add; hg ci -m 'C1'; \
hg boo B-ORIG; \
echo F1-2 >> F1; hg ci -m 'C2'; \
cd ..; hg clone r1 r2; cd r2; \
echo F1-3 >> F1; hg ci -m 'C3'; \
cd ../r1; \
echo LOCAL-ADJUST >> F1; hg ci -m 'Local commit'; \
hg boo LOCAL-BOO; \
\
hg boo -fr LOCAL-BOO^ B-ORIG; \
\
hg up B-ORIG; \
hg pull -u ../r2
At this point the update is not performed because
a new head has been created. That's perfectly fine.
But i wonder why the bookmark hasn't been moved -
B-ORIG still points to revision 1.
Even this is perfectly fine per se, but as far as
i understand
http://mercurial.selenic.com/wiki/BookmarksExtension:
If we commit at this point in the graph we'll
create a new head. Note how the bookmark follows
along, continuing to point to our working head.
This does not happen here.
Though it *does* happen if a "fast-forward" (is this
term copyrighted???) 'pull -u' is possible i.e. if no
new head is created).
And the required 'hg up' does not move the bookmark
automatically.
It's only syntactic sugar in the end, but i think
it should at least be stated in the documentation,
because the first time i ran into this situation
i was a bit irritated and thought that i've had
found a bug.
To tell the truth i feel *uncomfortable* with this
behaviour, because when you have some local commits
which you need to 'rebase' whenever the repo has
been 'pull'ed each pull ends up as
'pull; rebase; boo -fr xy ORIG' (at least).
Ok, still better than rcs(1), but...
----------
messages: 15800
nosy: sdaoden
priority: feature
status: unread
title: pull moves boo, but not after head creation
____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2720>
____________________________________________________
More information about the Mercurial-devel
mailing list