[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

fix readme header

slight change to the evolve logo thank to Adrien Di Mascio

docs: fix makefile

doc: add a logo It's not that cute be we have one.

README: remove bogus date This version is not released yet.

update changelog

commit --amend: adap to core 63e45aee46d4 commit is now able to create obsolete marker itself. We don't alter core if we detect it's the case.

createmarkers: adapt to f85816af6294 in core The createmarkers function is now in core. Fallback on our function if not available

warning: work around phase limitation when computing warnings The new phase have not been written yet because we did not release the lock yet :-/

caches: now in core adapt to fb72eec7efd8 If we detect a cache mechanism in core we is it intead of instead our own

evolve-cmd: fix merge error detection for external tools.

Properly update after fold The previous version only set the parent, it did not rebuilt dirstate or update any file content.

fix hg pull --rebase There is more user of rebase than just the rebase command

remove all notion of --detach in the test Mercurial 2.3 killed --detach (dance)

fix missing --dest evolve output in dryrun

pkg: proper debian version

pkg: debian changelog