Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 13:02:07 +0100] rev 668
merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 13:05:01 +0100] rev 667
doc: update version information
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 13:01:34 +0100] rev 666
merge with hg2.4 compat branch
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 13:00:02 +0100] rev 665
Added tag 3.0.0 for changeset 862b6b71a358
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 12:57:58 +0100] rev 664
prepare for release 3.0.0
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 12:21:01 +0100] rev 663
mark test with 2.5
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 12:20:10 +0100] rev 662
merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 02 Feb 2013 12:17:00 +0100] rev 661
create a compat-hg2.4 branch
2.5 is out, 2.4 compatible code is parked in a compat-hg2.4 branch as we did for
2.3
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 25 Jan 2013 17:26:47 +0100] rev 660
hgext: add a simpler extension to enable obsolete on server
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 25 Jan 2013 16:59:20 +0100] rev 659
drop: divergence related code
It is now in code
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 25 Jan 2013 16:42:49 +0100] rev 658
evolve: remove revset calls in warnobserror
revset have serious performance impact in several case.
The resulting code is a bit too complicated to my taste. I hope for much simpler
implementation in core anyway.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 05 Jan 2013 18:10:07 +0100] rev 657
evolve: drop "troubles" and "troubled" method now in core
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 25 Jan 2013 16:31:29 +0100] rev 656
test: drop rebase test
We assume that the mercurial rebases tests suite is strong enough now.
Greg Ward <greg@gerg.ca> [Thu, 24 Jan 2013 18:05:59 -0500] rev 655
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.
Greg Ward <greg@gerg.ca> [Thu, 24 Jan 2013 18:02:00 -0500] rev 654
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.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 07 Dec 2012 12:14:46 +0100] rev 653
[evolve] Drop useless filtered code
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 04 Jan 2013 12:43:22 +0100] rev 652
merge with filtering change (DO NOT USE WITHOUT FILTERING)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 04 Jan 2013 12:42:43 +0100] rev 651
evolve: ensure evolve command run unfiltered
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 04 Jan 2013 11:47:45 +0100] rev 650
test: drop divergent test
It is into core now
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 02 Jan 2013 14:41:47 +0100] rev 649
evolve: stop working around phase limitation
Core is handling this part a bit better
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:52:32 +0100] rev 648
fix punctuation
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 15:57:51 +0100] rev 647
evolve: fix version message
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 15:01:30 +0100] rev 646
test: more resistance to filtering changes
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:38:40 +0100] rev 645
merge with stable
Denis Laxalde <denis.laxalde@logilab.fr> [Mon, 03 Dec 2012 14:41:14 +0100] rev 644
support -r option in prune, add a test for this
Also localize options in fold.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:28:04 +0100] rev 643
doc: index version info on index
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:22:20 +0100] rev 642
doc: updates mq refugee book
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:17:17 +0100] rev 641
doc: update how-to
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 14:01:24 +0100] rev 640
tutorial: second replacement of hg amend by commit --amend
(the diff is huge because commit --amend have protection vs cycle)
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 13:48:48 +0100] rev 639
tutorial: use evolve directly
We a real mode in addition to the dry run one.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 12:37:25 +0100] rev 638
tutorial: use rebase instead of graft -O
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 12:23:56 +0100] rev 637
tutorial: use commit --amend when possible
commit --amend is the core way to do that, we better get used to it.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 12:15:56 +0100] rev 636
evolve: make evolve smarter
It is not more confused by killed changeset and can also choose to stabilise '.'
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 11:52:22 +0100] rev 635
tutorial: update notes in unwritten section
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 11:49:22 +0100] rev 634
tutorial: glog is into core now
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 18 Dec 2012 17:31:23 +0100] rev 633
test: adapt to the way the bundle is generated
optimised generation gives 1 changes, strict on gives 2.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 05 Dec 2012 11:30:24 +0100] rev 632
fold: work around potential bug with filtering
Folded revision may be becomes filtered leading to a crash of the replaced rset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 04 Dec 2012 00:18:32 +0100] rev 631
prepare for filtering
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 17 Dec 2012 14:33:01 +0100] rev 630
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.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Dec 2012 16:30:25 +0100] rev 629
Added tag 2.1.0 for changeset f9d305deeff3
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Dec 2012 15:19:24 +0100] rev 628
[prepare] 2.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Dec 2012 15:13:50 +0100] rev 627
update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 03 Dec 2012 15:11:09 +0100] rev 626
merge with fix in 2.3
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 03 Dec 2012 00:10:58 +0100] rev 625
prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 02 Dec 2012 16:21:19 +0100] rev 624
more versatile test.
push can fails on any divergent changeset I do not care for now.
Denis Laxalde <denis.laxalde@logilab.fr> [Wed, 28 Nov 2012 10:19:43 +0100] rev 623
fix retrieval of divergent changesets in obssummary (typo)
Add a test for this; drop wrong divergent print in 'Test rollback support'.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 27 Nov 2012 14:28:41 +0100] rev 622
merge with Denis improvement
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 27 Nov 2012 14:27:50 +0100] rev 621
merge with Denis improvement
Denis Laxalde <denis.laxalde@logilab.fr> [Thu, 22 Nov 2012 11:30:36 +0100] rev 620
use comments to combine commit messages in fold
Denis Laxalde <denis.laxalde@logilab.fr> [Mon, 26 Nov 2012 11:59:40 +0100] rev 619
add a -e option to fold
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:37:30 +0100] rev 618
merge
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:14:20 +0100] rev 617
detect incompatibility with future mercurial 2.5
changes in bookmark break compatibility
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:05:51 +0100] rev 616
merge
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:03:39 +0100] rev 615
merge
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:03:23 +0100] rev 614
Added tag 1.1.0 for changeset 22cacfce2a65
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 21 Nov 2012 11:02:37 +0100] rev 613
fix version in setup.py
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 21 Nov 2012 00:18:41 +0100] rev 612
adapt to 7f5dab94e48c in crew
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 15 Nov 2012 15:46:54 +0100] rev 611
deprecate "amend --change" option
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 07 Nov 2012 17:23:01 +0100] rev 610
merge with qsync fix
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 07 Nov 2012 17:22:41 +0100] rev 609
merge with qsync fix
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 07 Nov 2012 17:22:16 +0100] rev 608
merge with qsync fix
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 07 Nov 2012 17:19:54 +0100] rev 607
[qsync] fix filestore usage
The filestore was closed too early, dropping on disk cache
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
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Sep 2012 11:45:00 +0200] rev 550
evolve-cmd: fix merge error detection for external tools.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 10 Sep 2012 18:56:44 +0200] rev 549
Properly update after fold
The previous version only set the parent, it did not rebuilt dirstate or update
any file content.