https://bz.mercurial-scm.org/show_bug.cgi?id=5923
Bug ID: 5923
Summary: 'hg evolve' doesn't move active bookmark from obsolete
commit to its replacement
Product: Mercurial
Version: 4.6.1
Hardware: PC
OS: Other
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: evolution
Assignee: bugzi...@mercurial-scm.org
Reporter: jef...@josefsipek.net
CC: mercurial-devel@mercurial-scm.org,
pierre-yves.da...@ens-lyon.org
I've seen this happen twice now:
Initially the local system has:
- 8978626fdada0a6991b38a5f4936058e47d94998 &
85deaa39f14048c45105de2696d3c17d1537acb7 are both draft phase
- an active bookmark "use-events" is at
8978626fdada0a6991b38a5f4936058e47d94998
- the working dir is at 8978626fdada0a6991b38a5f4936058e47d94998
The remote system has just one head (b4e5a566c29595eecb14e814ef6bae18fe6ab660)
which was an amended version of the old local head
(8978626fdada0a6991b38a5f4936058e47d94998) and no bookmarks. (The use case
here is that the local repo is a hggit repo while the remote one is a hg repo
on a dev box.)
$ hg pull otherbox
pulling from ssh://otherbox/src/foobar/
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 5 changes to 6 files (+1 heads)
3 new obsolescence markers
obsoleted 2 changesets
new changesets a864b3746190:b4e5a566c295
(run 'hg heads .' to see heads, 'hg merge' to merge)
working directory parent is obsolete! (8978626fdada)
(use 'hg evolve' to update to its successor: b4e5a566c295)
$ hg evolve
update:[1003] REDACT2
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory is now at b4e5a566c295
An after the evolve the bookmark "use-events" is still active and still at the
old (now obsolete) commit 8978626fdada0a6991b38a5f4936058e47d94998:
$ hg log -G
@ commit b4e5a566c29595eecb14e814ef6bae18fe6ab660 D tip
| Author: Josef 'Jeff' Sipek <jeff.sipek@redact>
| Date: Tue Jun 5 16:01:37 2018 -0400
|
| REDACT2
|
o commit a864b3746190dab0fbaf9113c01aa1aef1c51fa6 D
| Parent: 995:ac2324e47f7b
| Author: Josef 'Jeff' Sipek <jeff.sipek@redact>
| Date: Tue Jun 5 15:46:38 2018 -0400
|
| REDACT1
|
| x commit 8978626fdada0a6991b38a5f4936058e47d94998 D use-events
| | Author: Josef 'Jeff' Sipek <jeff.sipek@redact>
| | Date: Tue Jun 5 16:01:37 2018 -0400
| |
| | REDACT2
| |
| x commit 85deaa39f14048c45105de2696d3c17d1537acb7 D
|/ Parent: 995:ac2324e47f7b
| Author: Josef 'Jeff' Sipek <jeff.sipek@redact>
| Date: Tue Jun 5 15:46:38 2018 -0400
|
| REDACT1
|
...
$ hg version -v
Mercurial Distributed SCM (version 4.6.1+5-d591c80025ee)
(see https://mercurial-scm.org for more information)
Copyright (C) 2005-2018 Matt Mackall and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Enabled extensions:
hgk internal
graphlog internal
purge internal
gpg internal
churn internal
pager internal
shelve internal
histedit internal
rebase internal
patchbomb internal
githelp internal
evolve external 8.0.1
topic external 0.9.1
hggit external 0.8.11 (dulwich 0.17.3)
--
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
