test: drop rebase test We assume that the mercurial rebases tests suite is strong enough now.

doc: fix grammar, spelling, punctuation I restrained myself to making only changes that turn bad English into good English. There are still opportunities to improve, but other changes require some discussion and review. This change should be uncontroversial.

tutorial: fix grammar, spelling, punctuation I restrained myself to making only changes that turn bad English into good English. There are still opportunities to improve the tutorial, but other changes require some discussion and review. This change should be uncontroversial. The same changes had to be duplicated in both copies of the tutorial (hmmm); it's not clear which one is definitive.

[evolve] Drop useless filtered code

merge with filtering change (DO NOT USE WITHOUT FILTERING)

evolve: ensure evolve command run unfiltered

test: drop divergent test It is into core now

evolve: stop working around phase limitation Core is handling this part a bit better

fix punctuation

evolve: fix version message

test: more resistance to filtering changes

merge with stable

support -r option in prune, add a test for this Also localize options in fold.

doc: index version info on index

doc: updates mq refugee book

doc: update how-to

tutorial: second replacement of hg amend by commit --amend (the diff is huge because commit --amend have protection vs cycle)

tutorial: use evolve directly We a real mode in addition to the dry run one.

tutorial: use rebase instead of graft -O

tutorial: use commit --amend when possible commit --amend is the core way to do that, we better get used to it.

evolve: make evolve smarter It is not more confused by killed changeset and can also choose to stabilise '.'

tutorial: update notes in unwritten section

tutorial: glog is into core now

test: adapt to the way the bundle is generated optimised generation gives 1 changes, strict on gives 2.

fold: work around potential bug with filtering Folded revision may be becomes filtered leading to a crash of the replaced rset.

prepare for filtering

compat: adapt to upstreaming of divergent logic successorsset and divergent logic have been moved into core by changeset 4bec77e62c00::e411fd79ca69 We drop dedicated code in evolve.

Added tag 2.1.0 for changeset f9d305deeff3

[prepare] 2.1.0

update changelog

merge with fix in 2.3

prepare for Full scale filtering !!!

more versatile test. push can fails on any divergent changeset I do not care for now.

fix retrieval of divergent changesets in obssummary (typo) Add a test for this; drop wrong divergent print in 'Test rollback support'.

merge with Denis improvement

merge with Denis improvement

use comments to combine commit messages in fold

add a -e option to fold

merge

detect incompatibility with future mercurial 2.5 changes in bookmark break compatibility

merge

merge

Added tag 1.1.0 for changeset 22cacfce2a65

fix version in setup.py

adapt to 7f5dab94e48c in crew

deprecate "amend --change" option

merge with qsync fix

merge with qsync fix

merge with qsync fix

[qsync] fix filestore usage The filestore was closed too early, dropping on disk cache

merge back with stable

Added tag 2.0.0 for changeset d43e80504e5

evolve: some comment update Bumped is in core now.

update debian control

merge 2.4 code back into default.

merge with 1.1.0

Added tag 1.1.0 for changeset c062edbcaf13

Fix debian control

prepare a branch for Compat with mercurial 2.3 only

prepares evolve 1.1.0

merge changelog update

update changelog with future 1.1.0 news

merge bumped rename (drop several part of the code because bumped is now in core)

evolve: Rename latecomer into bumped This is the new name in core

evolve: set tested with 2.4

evolve: require Mercurial 2.4 to work

evolve: adapt to 2.4 code

merge with stable

mercurial: replace all `newerversion` call by `successorsset` call

evolve: smarter code for divergent changeset This newer version properly handle split now. Code and test copied for future upstream one.

evolve: rename conflicting into divergent

evolve: detect and abort if 2.4 is detected The meaning of critical attribut have changed in 2.4

evolve: add tested with info

merge stable into default

test-stabilize-conflict.t: fix "eight" spelling

test-stabilize-conflict.t: sed -i is still not portable

test-stabilize-conflict.t: yes is not a standard shell utility And for some reason the test fails on OSX.

evolve: drop code now in core The default branch aims compat with the mercurial default branch. we do not need all those conditional.

merge with default

evolve: filter nullid successors

evolve: new divergent revset

doc: rename conflicting to divergent.

more schema

merge stable into default

adapt to core rebase support

rebase: warn about troubles created by rebase The previous order created obsolete marker after checking for new troubles

test-obsolete: clean up useless inlined option rebase is enabled globally and graphlog is into core

add image magic depends

upgrade debian changelog

update MANIFEST.in

merge (overwrite wrong tag)

Added tag 1.0.2 for changeset 5559e5a4b656

prepare 1.0.2

Added tag 1.0.2 for changeset b1bdcb4506de

hg prune: prevent empty call

fold: handle the lack of revision to fold