[issue3285] Advance bookmark on bare update with "hg pull --rebase"

Jean-Pierre Bergamin bugs at mercurial.selenic.com
Mon Feb 27 07:45:32 UTC 2012


New submission from Jean-Pierre Bergamin <jpbergamin at gmail.com>:

Mercurial 2.1 introduced the behaviour that a bookmark is advanced to tip 
when pulling and updating 
(http://mercurial.selenic.com/bts/issue2894), which is definitively an 
acceptable behaviour.
Now when pulling, I normally do just a "hg pull --rebase", if there is 
something to rebase or not. When 
using the --rebase option and there is "nothing to rebase" (as the command 
also tells you), the bookmark 
is not advanced. 

Two examples:

The "master" bookmark is advanced to "tip" with a "normal" hg pull -u:

[james at JAMES-PC ~/hgtest/A]$ hg pull -u
pulling from C:\cygwin\home\james\hgtest\central
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating bookmark master
[james at JAMES-PC ~/hgtest/A]$ hg glog -l 5
@  changeset:   16:a62668a18167
|  bookmark:    master
|  tag:         tip
|  user:        james
|  date:        Thu Feb 23 21:12:58 2012 +0100
|  summary:     B7
|

But using the --rebase option leaves the bookmark where it was:

[james at JAMES-PC ~/hgtest/A]$ hg pull --rebase
pulling from C:\cygwin\home\james\hgtest\central
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
nothing to rebase
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
[james at JAMES-PC ~/hgtest/A]$ hg glog -l 5
@  changeset:   17:a3edb024d777
|  tag:         tip
|  user:        james
|  date:        Thu Feb 23 21:15:13 2012 +0100
|  summary:     B8
|
o  changeset:   16:a62668a18167
|  bookmark:    master
|  user:        james
|  date:        Thu Feb 23 21:12:58 2012 +0100
|  summary:     B7
|
o  changeset:   15:b4de1001380f
|  user:        james
|  date:        Thu Feb 23 21:10:02 2012 +0100
|  summary:     zzz

I'd expect "hg pull --rebase" to advance the bookmark as well - since it 
already knows that there is 
nothing to rebase. So in fact it's the same as "hg pull -u" in this case.

See also https://groups.google.com/forum/?
fromgroups#!topic/mercurial_general/2GGSQa7SsYw

----------
messages: 19180
nosy: ractive
priority: bug
status: unread
title: Advance bookmark on bare update with "hg pull --rebase"
topic: bookmarks, update

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



More information about the Mercurial-devel mailing list