evolve: handle invalid obsmarkers in the `debugobsconvert` User can now recover from such situation, The error message is also changed to point the `debugobsconvert` commands.

fix release date in the readme

merge stable in default

Added tag 5.1.0 for changeset bfe9be352453

update readme and bump version to 5.1

merge default into table 3.3 is about to be released.

discovery: filter null from the discovery revset If there is nothing in common, common will be "null" and the revset will now returns "-1" crashing the discovery process. We filter out the null revision to prevent that.

tests: update to new core output Multiple output change need to be applied to the test suite.

evolve: explicitly disable bookmark on evolve (issue4432) We no longer leave the current bookmark active after an evolve, since it is no longer pointing to the working directory.

discovery: do not build sample if undecided is smaller than sample size This prevents crash with coming change in the mercurial discovery.

merge with stable

init: don't abort Mercurial on version mismatch Evolve causes Mercurial to exit if there is a version mismatch, even if no evolve command is invoked. This is a headache for people who have to work with multiple versions of Mercurial. Instead, raise an ImportError, which gives a warning but otherwise allows Mercurial to run non-evolve commands.

Added tag 5.0.2 for changeset dbd0733e5840

prepare release 5.0.2

test: adapt to core change in graft and rebase The ouput changed we have to adapt

merge with stable

doc: drop rebase extension activation The dependency have been dropped.

evolve: remove the dependency to the rebase extension We do not use any rebase internal anymore.

evolve: remove the use of `rebase.concludenode` Half of this function is now done in `merge.graft` and the over part is easy to redo manually. So we remove the usage of this function to remove the dependency of evolve on the rebase extension.

evolve: use `merge.graft` instead of `rebasenode` The core mechanism is properly factorised and have a more stable API. This is also a good step toward removing the dependency between evolve and the rebase extension. This also avoid a breakage with the future 3.3 where some of the rebase API changed.

readme: add a reference to the bugtracker in the contribute section Idea from Patrick Mezard

merge with stable

debian: update changelog to 5.0.1

test: adapt test to stable output Stable branch should pass test with mercurial stable branch.

Added tag 5.0.1 for changeset 0f3090785283

evolve: update in file version (I'll eventually -not- forget to do so)

Added tag 5.0.1 for changeset 51e1e962172c

readme: prepare for release 5.0.1