Mercurial > evolve
changeset 331:b230da8bc498
merge back with stable
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Wed, 27 Jun 2012 15:29:25 +0200 |
| parents | 52c53e2d413b (current diff) c2223b3f611a (diff) |
| children | adeebf3b9ac3 |
| files | |
| diffstat | 2 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Jun 27 15:10:59 2012 +0200 +++ b/.hgtags Wed Jun 27 15:29:25 2012 +0200 @@ -1,2 +1,3 @@ 6c6bb7a23bb5125bf06da73265f039dd3447dafa 0.1.0 d3f20770b86a31dba56ae7b252089e12b34702da 0.2.0 +c046b083a5e0b21af69027f31cee141800cf894b 0.3.0
--- a/README Wed Jun 27 15:10:59 2012 +0200 +++ b/README Wed Jun 27 15:29:25 2012 +0200 @@ -46,12 +46,15 @@ 0.3.0 -- - 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) -- obsolete: fewer marker are created when collapsing revision. -- revset: add successors, allsuccessors, precursors, all precursors and hidden -- evolve: add `prune` alias to `kill`. +- 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) +- obsolete: fewer marker are created when collapsing revision. +- revset: add, successors(), allsuccessors(), precursors(), allprecursors(), + latecomer() and hidden() +- evolve: add `prune` alias to `kill`. +- stabilize: clearly state that stabilize does nto handle conflict +- template: add an {obsolete} keyword 0.2.0 -- 2012-06-20