Mercurial > evolve
changeset 668:c5a5e9f2c959
merge with stable
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Sat, 02 Feb 2013 13:02:07 +0100 |
parents | e6e47c432ffd (current diff) ae99c0f06fcb (diff) |
children | ddb7013da614 |
files | |
diffstat | 5 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Jan 25 17:26:47 2013 +0100 +++ b/.hgtags Sat Feb 02 13:02:07 2013 +0100 @@ -16,3 +16,4 @@ 22cacfce2a65ab965c6179ae862b148f4abc7d8a 1.1.0 d43e80504e55db9ad4826e860e50530103a27b0f 2.0.0 f9d305deeff3dba782e65faf4ef3fd1569995859 2.1.0 +862b6b71a35836e81f090ba7229c2888e8ed2f9f 3.0.0
--- a/README Fri Jan 25 17:26:47 2013 +0100 +++ b/README Sat Feb 02 13:02:07 2013 +0100 @@ -11,9 +11,7 @@ It also: - 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 + - issues several warning messages when troubles appear in your repository. **These extensions are experimental and are not meant for production.** @@ -46,6 +44,10 @@ Changelog ================== +3.0.0 -- 2013-02-02 + +- compatibility with 2.5 + 2.2.0 -- - make evolve smarter at picking next troubled to solved without --any
--- a/docs/evolve-faq.rst Fri Jan 25 17:26:47 2013 +0100 +++ b/docs/evolve-faq.rst Sat Feb 02 13:02:07 2013 +0100 @@ -133,7 +133,7 @@ For more complexe scenario we recommend the use of the histedit_ extension. -.. _histedit:: http://mercurial.selenic.com/wiki/HisteditExtension +.. _histedit: http://mercurial.selenic.com/wiki/HisteditExtension Update my current work in progress after a pull