Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 16:53:11 +0200] rev 589
merge with stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 16:49:29 +0200] rev 588
mercurial: replace all `newerversion` call by `successorsset` call
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 16:36:29 +0200] rev 587
evolve: smarter code for divergent changeset
This newer version properly handle split now. Code and test copied for future
upstream one.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 15:44:24 +0200] rev 586
evolve: rename conflicting into divergent
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 15:05:32 +0200] rev 585
evolve: detect and abort if 2.4 is detected
The meaning of critical attribut have changed in 2.4
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 15:03:25 +0200] rev 584
evolve: add tested with info
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 14 Oct 2012 16:23:25 +0200] rev 583
merge stable into default
Patrick Mezard <patrick@mezard.eu> [Sat, 13 Oct 2012 16:44:14 +0200] rev 582
test-stabilize-conflict.t: fix "eight" spelling
Patrick Mezard <patrick@mezard.eu> [Sat, 13 Oct 2012 16:38:23 +0200] rev 581
test-stabilize-conflict.t: sed -i is still not portable
Patrick Mezard <patrick@mezard.eu> [Sat, 13 Oct 2012 16:31:52 +0200] rev 580
test-stabilize-conflict.t: yes is not a standard shell utility
And for some reason the test fails on OSX.