Fri, 28 Oct 2016 16:26:25 +0200 merge with future 5.5 mercurial-3.7
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 28 Oct 2016 16:26:25 +0200] rev 1748
merge with future 5.5 No extra new change are needed from the one needed from the 3.8 branch and previous version.
Fri, 28 Oct 2016 16:16:19 +0200 merge with future 5.5 mercurial-3.8
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 28 Oct 2016 16:16:19 +0200] rev 1747
merge with future 5.5 Test also run on 3.8 with minor cosmetic change. The 'separate' function is not available before 3.9 so we had to drop it.
Fri, 28 Oct 2016 16:03:00 +0200 integrate code update and test change from future 5.5 code mercurial-3.9
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 28 Oct 2016 16:03:00 +0200] rev 1746
integrate code update and test change from future 5.5 code This prove that the code is compatible with 3.9
Fri, 28 Oct 2016 15:44:15 +0200 merge with default, Mercurial 4.0-rc is out stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 28 Oct 2016 15:44:15 +0200] rev 1745
merge with default, Mercurial 4.0-rc is out The content of the Mercurial stable branch changed, we update it here too.
Fri, 28 Oct 2016 15:43:21 +0200 open the mercurial-3.9 compat branch mercurial-3.9
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 28 Oct 2016 15:43:21 +0200] rev 1744
open the mercurial-3.9 compat branch
Sun, 16 Oct 2016 20:29:27 +0200 merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 16 Oct 2016 20:29:27 +0200] rev 1743
merge with stable
Sun, 16 Oct 2016 09:52:53 -0700 evolve: lock the working copy early in next and prev (issue5244) stable
Simon Farnsworth <simonfar@fb.com> [Sun, 16 Oct 2016 09:52:53 -0700] rev 1742
evolve: lock the working copy early in next and prev (issue5244) Both next and prev depend on a consistent working copy, but were waiting to take the lock until they were ready to alter the working copy. Take the lock before reading the working copy state, and do not release it until we're definitely not going to change the working copy.
Sat, 08 Oct 2016 08:14:21 -0700 evolve: indent cmdnext and cmdprev ready for locking change (issue5244) stable
Simon Farnsworth <simonfar@fb.com> [Sat, 08 Oct 2016 08:14:21 -0700] rev 1741
evolve: indent cmdnext and cmdprev ready for locking change (issue5244) The locking change I'm about to introduce forces an indentation shift. Do the indentation change with no code change now, to make the next change easier to review
Sun, 16 Oct 2016 13:50:45 +0200 tests: adapt to some change to topic output stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 16 Oct 2016 13:50:45 +0200] rev 1740
tests: adapt to some change to topic output
Sat, 08 Oct 2016 15:49:12 +0200 split: avoid trying to split an empty commit (issue5191) stable
Philippe Pepiot <philippe.pepiot@logilab.fr> [Sat, 08 Oct 2016 15:49:12 +0200] rev 1739
split: avoid trying to split an empty commit (issue5191)
Sat, 08 Oct 2016 15:49:12 +0200 split: avoid trying to split an empty commit (issue5191)
Philippe Pepiot <philippe.pepiot@logilab.fr> [Sat, 08 Oct 2016 15:49:12 +0200] rev 1738
split: avoid trying to split an empty commit (issue5191)
Thu, 22 Sep 2016 09:15:30 -0700 evolve: fix test breaks related to double->single quote changes
Kostia Balytskyi <ikostia@fb.com> [Thu, 22 Sep 2016 09:15:30 -0700] rev 1737
evolve: fix test breaks related to double->single quote changes
Tue, 13 Sep 2016 01:25:17 +0200 merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 13 Sep 2016 01:25:17 +0200] rev 1736
merge with stable
Mon, 12 Sep 2016 10:41:00 -0700 bump: copy parent manifest before editting it stable
Durham Goode <durham@fb.com> [Mon, 12 Sep 2016 10:41:00 -0700] rev 1735
bump: copy parent manifest before editting it Previously, the bump code would access the previous manifest, then edit that dictionary data structure. Because the manifest was in the mancache at that time, those edits were persisted to other readers who asked for that manifest. This caused commits being made during bump to have the wrong file parents in many situations (hence why the tests need updating).
(0) -1000 -300 -100 -14 +14 +100 +300 +1000 +3000 tip