Mercurial > evolve
changeset 427:b86e062f2335
merge with stable
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Mon, 06 Aug 2012 19:34:24 +0200 |
| parents | 9720ac97445f (current diff) 37cba4324ccf (diff) |
| children | 1c82147e9395 |
| files | |
| diffstat | 2 files changed, 45 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Aug 06 19:16:30 2012 +0200 +++ b/.hgtags Mon Aug 06 19:34:24 2012 +0200 @@ -5,3 +5,6 @@ 4ecbaec1d664b1e6f8ebc78292e1ced77a8e69c0 0.4.1 7ef8ab8c6feadb8a9d9e13af144a17cb23e9a38d 0.5 4a5488c01a66be4729252175cea0ea739a88a540 0.6 +18a0d96ed559089edf90206c469f3f8c26681c64 0.7 +18a0d96ed559089edf90206c469f3f8c26681c64 0.7 +1b2757c1bd918509184f6c1d06b2329a847e31b0 0.7
--- a/README Mon Aug 06 19:16:30 2012 +0200 +++ b/README Mon Aug 06 19:34:24 2012 +0200 @@ -43,9 +43,49 @@ Changelog ================== -0.3.0 -- +0.7 -- 2012-08-06 + +- hook: work around insanely huge value in obsolete pushkey call +- pushkey: properly handle abort during obsolete markers push +- amend: wrap the whole process in a single transaction. +- evolve: tweak and add EOL to kill warning +- obsolete: fix doc, rebase no longer aborts with --keep +- obsolete/evolve: fix grammar in prerequisite messages +- evolve: avoid duplication in graft wrapper +- evolve: graft --continue is optional, test + +0.6 -- 2012-07-31 + +- obsolete: change warning output to match mercurial core on +- qsync: ignore unexistent nodes +- make compat server both compatible with "dump" and "dump%i" version + +0.5 -- 2012-07-16 -- obsolete: Add "latecomer" error detection (stabilize does not handle resolution yet) +- obsolete: Detect conflicting changeset! +- obsolete: adapt to core: marker are written in transaction now +- evolve: add the solve alias to obsolete +- doc: big update of terms and summary of the concept +- evolve: switch the official name for "kill" to prune + + +0.4.1 -- 2012-07-10 + +- [convert] properly exclude null successors from convertion +- Ignore buggy marker in newerversion + + +0.4.0 -- 2012-07-06 + +- obsolete: public changeset are no longer latecomer. +- obsolete: move to official binary format +- adapt for new mercurial +- obsolete: we are not compatible with 2.1 any more + +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 - commit: --amend option create obsolete marker (but still strip)