Mercurial > evolve
changeset 1618:a3da15803b7a
merge stable into default
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 25 Feb 2016 13:18:36 +0100 |
| parents | c216b175d535 (current diff) 160968654581 (diff) |
| children | 5ef77a1d975c |
| files | |
| diffstat | 7 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/README Sun Feb 14 14:37:40 2016 +0000 +++ b/README Thu Feb 25 13:18:36 2016 +0100 @@ -16,7 +16,7 @@ You can enable it by adding the line below to the ``extensions`` section of your hgrc:: - evolve = PATH/TO/mutable-history/hgext/evolve.py + evolve = PATH/TO/evolve-main/hgext/evolve.py We recommend reading the documentation first. An online version is available here:
--- a/debian/control Sun Feb 14 14:37:40 2016 +0000 +++ b/debian/control Thu Feb 25 13:18:36 2016 +0100 @@ -15,7 +15,7 @@ librsvg2-bin, wget, Python-Version: >= 2.6 -Homepage: https://bitbucket.org/marmoute/mutable-history +Homepage: http://evolution.experimentalworks.net/ Package: mercurial-evolve Architecture: all
--- a/debian/copyright Sun Feb 14 14:37:40 2016 +0000 +++ b/debian/copyright Thu Feb 25 13:18:36 2016 +0100 @@ -1,5 +1,5 @@ This software was downloaded from -https://bitbucket.org/marmoute/mutable-history +http://hg.netv6.net/evolve-main/ Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com> Logilab SA <contact@logilab.fr>
--- a/docs/index.rst Sun Feb 14 14:37:40 2016 +0000 +++ b/docs/index.rst Thu Feb 25 13:18:36 2016 +0100 @@ -113,7 +113,7 @@ #. Clone the ``evolve`` repository:: cd ~/src - hg clone https://bitbucket.org/marmoute/mutable-history + hg clone http://hg.netv6.net/evolve-main #. Configure the extension, either locally :: @@ -125,7 +125,7 @@ Then add :: - evolve=~/src/mutable-history/hgext/evolve.py + evolve=~/src/evolve-main/hgext/evolve.py in the ``[extensions]`` section (adding the section if necessary). Use the directory that you actually cloned to, of course.
--- a/docs/sharing.rst Sun Feb 14 14:37:40 2016 +0000 +++ b/docs/sharing.rst Thu Feb 25 13:18:36 2016 +0100 @@ -102,7 +102,7 @@ publish = false [extensions] - evolve = /path/to/mutable-history/hgext/evolve.py + evolve = /path/to/evolve-main/hgext/evolve.py Then edit the configuration for ``dev-repo``:: @@ -111,7 +111,7 @@ and add :: [extensions] - evolve = /path/to/mutable-history/hgext/evolve.py + evolve = /path/to/evolve-main/hgext/evolve.py Keep in mind that in real life, these repositories would probably be on separate computers, so you'd have to login to each one to configure @@ -331,7 +331,7 @@ and add :: [extensions] - evolve = /path/to/mutable-history/hgext/evolve.py + evolve = /path/to/evolve-main/hgext/evolve.py Then edit Bob's repository configuration:: @@ -545,7 +545,7 @@ [extensions] rebase = - evolve = /path/to/mutable-history/hgext/evolve.py + evolve = /path/to/evolve-main/hgext/evolve.py [phases] publish = false
--- a/hgext/evolve.py Sun Feb 14 14:37:40 2016 +0000 +++ b/hgext/evolve.py Thu Feb 25 13:18:36 2016 +0100 @@ -2709,7 +2709,7 @@ lockmod.release(tr, lock, wlock) @command('^split', - [('r', 'rev', [], _("revision to fold")), + [('r', 'rev', [], _("revision to split")), ] + commitopts + commitopts2, _('hg split [OPTION]... [-r] REV')) def cmdsplit(ui, repo, *revs, **opts):
--- a/setup.py Sun Feb 14 14:37:40 2016 +0000 +++ b/setup.py Thu Feb 25 13:18:36 2016 +0100 @@ -29,7 +29,7 @@ author='Pierre-Yves David', maintainer='Pierre-Yves David', maintainer_email='pierre-yves.david@ens-lyon.org', - url='https://bitbucket.org/marmoute/mutable-history', + url='http://evolution.experimentalworks.net/', description='Flexible evolution of Mercurial history.', long_description=open('README').read(), keywords='hg mercurial',