Commits

Show all
Author Commit Message Labels Comments Date
Pierre-Yves David
update debian control
Pierre-Yves David
merge 2.4 code back into default.
Pierre-Yves David
merge with 1.1.0
Pierre-Yves David
Added tag 1.1.0 for changeset c062edbcaf13
Branches
compat-hg2.3
Pierre-Yves David
Fix debian control
Branches
compat-hg2.3
Pierre-Yves David
prepare a branch for Compat with mercurial 2.3 only
Branches
compat-hg2.3
Pierre-Yves David
prepares evolve 1.1.0
Pierre-Yves David
merge changelog update
Branches
default
Pierre-Yves David
update changelog with future 1.1.0 news
Pierre-Yves David
merge bumped rename (drop several part of the code because bumped is now in core)
Branches
default
Pierre-Yves David
evolve: Rename latecomer into bumped This is the new name in core
Pierre-Yves David
evolve: set tested with 2.4
Branches
default
Pierre-Yves David
evolve: require Mercurial 2.4 to work
Branches
default
Pierre-Yves David
evolve: adapt to 2.4 code
Branches
default
Pierre-Yves David
merge with stable
Branches
default
Pierre-Yves David
mercurial: replace all `newerversion` call by `successorsset` call
Pierre-Yves David
evolve: smarter code for divergent changeset This newer version properly handle split now. Code and test copied for future upstream one.
Pierre-Yves David
evolve: rename conflicting into divergent
Pierre-Yves David
evolve: detect and abort if 2.4 is detected The meaning of critical attribut have changed in 2.4
Pierre-Yves David
evolve: add tested with info
Pierre-Yves David
merge stable into default
Branches
default
Patrick Mézard
test-stabilize-conflict.t: fix "eight" spelling
Patrick Mézard
test-stabilize-conflict.t: sed -i is still not portable
Patrick Mézard
test-stabilize-conflict.t: yes is not a standard shell utility And for some reason the test fails on OSX.
Pierre-Yves David
evolve: drop code now in core The default branch aims compat with the mercurial default branch. we do not need all those conditional.
Branches
default
Pierre-Yves David
merge with default
Branches
default
Pierre-Yves David
evolve: filter nullid successors
Pierre-Yves David
evolve: new divergent revset
Pierre-Yves David
doc: rename conflicting to divergent.
Pierre-Yves David
more schema
  1. Prev
  2. Next