[issue2873] Bookmarks moved to tip instead of corresponding changesets when rebased

Paulo Madeira bugs at mercurial.selenic.com
Wed Jun 29 16:59:14 CDT 2011


New submission from Paulo Madeira <acelent at gmail.com>:

Windows 7 x64, hg 1.8.4:

> mkdir repo
> cd repo
> hg init
> echo text > text.txt
> hg add text.txt
> hg commit -m init
> echo 1 >> text.txt
> hg commit -m cs1
> echo 2 >> text.txt
> hg commit -m cs2
> hg bookmark -r 1 bm1
> hg bookmark -r 2 bm2
> hg update -r 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> echo a > text.txt
> echo text >> text.txt
> hg commit -m csa
created new head
> echo b > text.txt
> echo a >> text.txt
> echo text >> text.txt
> hg commit -m csb
> hg glog
@  changeset:   4:cb577b24b11e
|  tag:         tip
|  user:        Me
|  date:        Wed Jun 29 22:52:28 2011 +0100
|  summary:     csb
|
o  changeset:   3:b61bf3ff8f9b
|  parent:      0:7435046a8813
|  user:        Me
|  date:        Wed Jun 29 22:52:09 2011 +0100
|  summary:     csa
|
| o  changeset:   2:58a69beda595
| |  bookmark:    bm2
| |  user:        Me
| |  date:        Wed Jun 29 22:51:35 2011 +0100
| |  summary:     cs2
| |
| o  changeset:   1:1c394de767be
|/   bookmark:    bm1
|    user:        Me
|    date:        Wed Jun 29 22:51:26 2011 +0100
|    summary:     cs1
|
o  changeset:   0:7435046a8813
   user:        Me
   date:        Wed Jun 29 22:51:17 2011 +0100
   summary:     init

> hg rebase -s 1
merging text.txt
merging text.txt
saved backup bundle to C:\temp\repo\.hg\strip-backup\1c394de767be-backup.hg

> hg glog
@  changeset:   4:a97d1f1d83c3
|  bookmark:    bm1
|  bookmark:    bm2
|  tag:         tip
|  user:        Me
|  date:        Wed Jun 29 22:51:35 2011 +0100
|  summary:     cs2
|
o  changeset:   3:c92ef6c06a93
|  user:        Me
|  date:        Wed Jun 29 22:51:26 2011 +0100
|  summary:     cs1
|
o  changeset:   2:cb577b24b11e
|  user:        Me
|  date:        Wed Jun 29 22:52:28 2011 +0100
|  summary:     csb
|
o  changeset:   1:b61bf3ff8f9b
|  user:        Me
|  date:        Wed Jun 29 22:52:09 2011 +0100
|  summary:     csa
|
o  changeset:   0:7435046a8813
   user:        Me
   date:        Wed Jun 29 22:51:17 2011 +0100
   summary:     init


I was expecting bm1 to point to changeset 3.

----------
messages: 16642
nosy: acelent
priority: bug
status: unread
title: Bookmarks moved to tip instead of corresponding changesets when rebased
topic: rebase

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


More information about the Mercurial-devel mailing list