Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 18:05:21 +0200] rev 606
merge back with stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 18:02:51 +0200] rev 605
Added tag 2.0.0 for changeset d43e80504e5
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 17:44:52 +0200] rev 604
evolve: some comment update
Bumped is in core now.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 18:01:50 +0200] rev 603
update debian control
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 18:01:08 +0200] rev 602
merge 2.4 code back into default.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 18:00:18 +0200] rev 601
merge with 1.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 17:59:34 +0200] rev 600
Added tag 1.1.0 for changeset c062edbcaf13
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 17:58:31 +0200] rev 599
Fix debian control
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 17:40:25 +0200] rev 598
prepare a branch for Compat with mercurial 2.3 only
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 26 Oct 2012 17:38:51 +0200] rev 597
prepares evolve 1.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:45:21 +0200] rev 596
merge changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:44:31 +0200] rev 595
update changelog with future 1.1.0 news
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:43:22 +0200] rev 594
merge bumped rename
(drop several part of the code because bumped is now in core)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:32:22 +0200] rev 593
evolve: Rename latecomer into bumped
This is the new name in core
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:13:30 +0200] rev 592
evolve: set tested with 2.4
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:13:19 +0200] rev 591
evolve: require Mercurial 2.4 to work
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 23 Oct 2012 17:12:53 +0200] rev 590
evolve: adapt to 2.4 code
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.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 10 Oct 2012 15:26:09 +0200] rev 579
evolve: drop code now in core
The default branch aims compat with the mercurial default branch. we do not need
all those conditional.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 10 Oct 2012 15:11:31 +0200] rev 578
merge with default
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 10 Oct 2012 14:58:21 +0200] rev 577
evolve: filter nullid successors
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 27 Sep 2012 16:55:08 +0200] rev 576
evolve: new divergent revset
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 27 Sep 2012 16:40:25 +0200] rev 575
doc: rename conflicting to divergent.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 25 Sep 2012 12:06:48 +0200] rev 574
more schema
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 20 Sep 2012 23:14:59 +0200] rev 573
merge stable into default
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 19 Sep 2012 15:28:35 +0200] rev 572
adapt to core rebase support
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:30:07 +0200] rev 571
rebase: warn about troubles created by rebase
The previous order created obsolete marker after checking for new troubles
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 14:53:24 +0200] rev 570
test-obsolete: clean up useless inlined option
rebase is enabled globally and graphlog is into core
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 18:07:07 +0200] rev 569
add image magic depends
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:52:39 +0200] rev 568
upgrade debian changelog
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:52:33 +0200] rev 567
update MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:35:44 +0200] rev 566
merge (overwrite wrong tag)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:34:59 +0200] rev 565
Added tag 1.0.2 for changeset 5559e5a4b656
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 19 Sep 2012 17:34:03 +0200] rev 564
prepare 1.0.2
Pierre-Yves David <pierre-yves.david@logilab.fr> [Sun, 16 Sep 2012 04:19:52 +0200] rev 563
Added tag 1.0.2 for changeset b1bdcb4506de
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 14 Sep 2012 15:36:29 +0200] rev 562
hg prune: prevent empty call
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 12 Sep 2012 14:24:23 +0200] rev 561
fold: handle the lack of revision to fold
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 16:19:27 +0200] rev 560
fix readme header
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 16:17:56 +0200] rev 559
slight change to the evolve logo
thank to Adrien Di Mascio
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 16:17:11 +0200] rev 558
docs: fix makefile
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 15:59:27 +0200] rev 557
doc: add a logo
It's not that cute be we have one.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 15:57:54 +0200] rev 556
README: remove bogus date
This version is not released yet.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 14:05:37 +0200] rev 555
update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 13:51:24 +0200] rev 554
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.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 12:38:49 +0200] rev 553
createmarkers: adapt to f85816af6294 in core
The createmarkers function is now in core. Fallback on our function if not
available
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 12:30:22 +0200] rev 552
warning: work around phase limitation when computing warnings
The new phase have not been written yet because we did not release the lock yet
:-/
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 12:19:13 +0200] rev 551
caches: now in core adapt to fb72eec7efd8
If we detect a cache mechanism in core we is it intead of instead our own