Mercurial > evolve

changeset 1712:a4de197218cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 27 May 2016 17:36:07 +0200
parents b09ac378f025 (current diff) 7a2e0629bdee (diff)
children 00612a019547
files
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py	Fri May 06 00:22:54 2016 +0200
+++ b/hgext/evolve.py	Fri May 27 17:36:07 2016 +0200
@@ -33,7 +33,7 @@
 between repositories. This allows for a safe and simple way of exchanging
 mutable history and altering it after the fact. Changeset phases are
 respected, such that only draft and secret changesets can be altered (see
-:hg:`hg phases` for details).
+:hg:`help phases` for details).
 
 Obsolescence is tracked using "obsolete markers", a piece of metadata
 tracking which changesets have been made obsolete, potential successors for
@@ -51,7 +51,7 @@
 Current feature status
 ======================
 
-This feature is still in development.  If you see this help, you have enable an
+This feature is still in development.  If you see this help, you have enabled an
 extension that turned this feature on.
 
 Obsolescence markers will be exchanged between repositories that explicitly
--- a/hgext/inhibit.py	Fri May 06 00:22:54 2016 +0200
+++ b/hgext/inhibit.py	Fri May 27 17:36:07 2016 +0200
@@ -296,7 +296,8 @@
     # There are two ways to save bookmark changes during a transation, we
     # wrap both to add inhibition markers.
     extensions.wrapfunction(bookmarks.bmstore, 'recordchange', _bookmarkchanged)
-    extensions.wrapfunction(bookmarks.bmstore, 'write', _bookmarkchanged)
+    if getattr(bookmarks.bmstore, 'write', None) is not None:# mercurial < 3.9
+        extensions.wrapfunction(bookmarks.bmstore, 'write', _bookmarkchanged)
     # Add bookmark -D option
     entry = extensions.wrapcommand(commands.table, 'bookmark', _bookmark)
     entry[1].append(('D','prune',None,
--- a/tests/test-evolve.t	Fri May 06 00:22:54 2016 +0200
+++ b/tests/test-evolve.t	Fri May 27 17:36:07 2016 +0200
@@ -56,7 +56,7 @@
       between repositories. This allows for a safe and simple way of exchanging
       mutable history and altering it after the fact. Changeset phases are
       respected, such that only draft and secret changesets can be altered (see
-      'hg hg phases' for details).
+      'hg help phases' for details).
   
       Obsolescence is tracked using "obsolete markers", a piece of metadata
       tracking which changesets have been made obsolete, potential successors
@@ -76,7 +76,7 @@
       ======================
   
       This feature is still in development.  If you see this help, you have
-      enable an extension that turned this feature on.
+      enabled an extension that turned this feature on.
   
       Obsolescence markers will be exchanged between repositories that
       explicitly assert support for the obsolescence feature (this can currently