# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1340803765 -7200
# Node ID b230da8bc498ead3f89f0b20c6571aae70cc1b8d
# Parent  52c53e2d413bdf601fb97f1550f5889775a36808# Parent  c2223b3f611a0e042649b3918a6bec31b4d05409
merge back with stable

diff -r 52c53e2d413b -r b230da8bc498 .hgtags
--- 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
diff -r 52c53e2d413b -r b230da8bc498 README
--- 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