Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge stable in default
authorPierre-Yves David <pierre-yves.david@fb.com>
Fri, 30 Jan 2015 22:05:40 +0000
changeset 1200 242792d1e40a
parent 1196 9e3f332f7630 (current diff)
parent 1199 47f3bdbe0d9c (diff)
child 1208 46a465fb2aee
merge stable in default
--- a/.hgtags	Fri Jan 30 20:29:33 2015 +0000
+++ b/.hgtags	Fri Jan 30 22:05:40 2015 +0000
@@ -30,3 +30,4 @@
 51e1e962172c0178394cd36652d90181319f5416 5.0.1
 0f30907852831f818bd0d01141b4ab7d8d71b821 5.0.1
 dbd0733e584073d6a7b6dea933767853e9cfe845 5.0.2
+bfe9be352453640233371cc7deb409a09decacf9 5.1.0
--- a/README	Fri Jan 30 20:29:33 2015 +0000
+++ b/README	Fri Jan 30 22:05:40 2015 +0000
@@ -51,9 +51,11 @@
 Changelog
 =========
 
-5.0.3 --
+5.1 -- 2014-01-30
 
+- evolve: explicitly disable bookmark on evolve (issue4432)
 - evolve: don't abort Mercurial on version mismatch
+- comptatibility with mercurial 3.3
 
 5.0.2 -- 2014-12-14
 
@@ -274,7 +276,6 @@
 
 0.3.0 -- 2012-06-27
 
-- 
 - obsolete:  Add "latecomer" error detection (stabilize does not handle resolution yet)
 - evolve:    Introduce a new `uncommit` command to remove change from a changeset
 - rebase:    allow the use of --keep again
--- a/hgext/evolve.py	Fri Jan 30 20:29:33 2015 +0000
+++ b/hgext/evolve.py	Fri Jan 30 22:05:40 2015 +0000
@@ -19,8 +19,8 @@
     - improves some aspect of the early implementation in Mercurial core
 '''
 
-__version__ = '5.0.2'
-testedwith = '3.2'
+__version__ = '5.1.0'
+testedwith = '3.3'
 buglink = 'http://bz.selenic.com/'
 
 import sys, os
@@ -805,6 +805,10 @@
         try:
             if repo['.'].rev() != dest.rev():
                 merge.update(repo, dest, False, True, False)
+            if repo._bookmarkcurrent:
+                repo.ui.status(_("(leaving bookmark %s)\n") %
+                               repo._bookmarkcurrent)
+            bookmarks.unsetcurrent(repo)
             if keepbranch:
                 repo.dirstate.setbranch(orig.branch())
             r = merge.graft(repo, orig, orig.p1(), ['local', 'graft'])
--- a/tests/test-evolve.t	Fri Jan 30 20:29:33 2015 +0000
+++ b/tests/test-evolve.t	Fri Jan 30 22:05:40 2015 +0000
@@ -859,3 +859,20 @@
   nothing to evolve here
   (2 troubled changesets, do you want --any ?)
   [2]
+
+
+Evolve disables active bookmarks.
+
+  $ hg up 10
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg bookmark testbookmark
+  $ ls .hg/bookmarks*
+  .hg/bookmarks
+  .hg/bookmarks.current
+  $ hg evolve
+  move:[8] a2
+  atop:[10] a1__
+  (leaving bookmark testbookmark)
+  working directory is now at f37ed7a60f43
+  $ ls .hg/bookmarks*
+  .hg/bookmarks
evolve