changeset 1013:58ff9d9c0746

merge with stable
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 30 Jul 2014 13:40:40 -0700
parents a010ba5a0ffb (current diff) 205d549a972f (diff)
children 93507c20739e
files README hgext/evolve.py
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/README	Wed Jul 30 13:14:13 2014 -0700
+++ b/README	Wed Jul 30 13:40:40 2014 -0700
@@ -21,7 +21,7 @@
 We recommend reading the documentation first. An online version is
 available here:
 
-    http://hg-lab.logilab.org/doc/mutable-history/html/
+    http://evolution.experimentalworks.net/doc/
 
 Or see the ``doc/`` directory for a local copy.
 
@@ -49,7 +49,7 @@
 However, some cutting-edge changes may be found in a mutable repository hosted
 by logilab before they are published.
 
-    http://hg-lab.logilab.org/wip/mutable-history/
+    http://hg.netv6.net/marmoute-wip/evolve/
 
 Be sure to check latest draft changeset before submitting new changesets.
 
--- a/hgext/evolve.py	Wed Jul 30 13:14:13 2014 -0700
+++ b/hgext/evolve.py	Wed Jul 30 13:40:40 2014 -0700
@@ -16,11 +16,11 @@
     - enables the "Changeset Obsolescence" feature of mercurial,
     - alters core commands and extensions that rewrite history to use
       this feature,
-    - improves some aspect of the early implementation in 2.3
+    - improves some aspect of the early implementation in Mercurial core
 '''
 
 testedwith = '3.0.1 3.1'
-buglink = 'https://bitbucket.org/marmoute/mutable-history/issues'
+buglink = 'http://bz.selenic.com/'
 
 import sys
 import random