Wed, 01 Feb 2017 16:17:09 +0100 reopen the default branch
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 01 Feb 2017 16:17:09 +0100] rev 1801
reopen the default branch
Wed, 01 Feb 2017 16:03:39 +0100 merge with 5.6.0 mercurial-3.4
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 01 Feb 2017 16:03:39 +0100] rev 1800
merge with 5.6.0 no extra changes were needed from the mercurial-3.5 branch.
Wed, 01 Feb 2017 15:51:02 +0100 merge with 5.6.0 mercurial-3.5
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 01 Feb 2017 15:51:02 +0100] rev 1799
merge with 5.6.0 no extra changes were needed form the mercurial-3.6 branch.
Wed, 01 Feb 2017 15:45:20 +0100 merge with 5.6.0 mercurial-3.6
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 01 Feb 2017 15:45:20 +0100] rev 1798
merge with 5.6.0 No extra changes were needed from the mercurial-3.7 branch.
Wed, 01 Feb 2017 15:40:51 +0100 merge with 5.6.0 mercurial-3.7
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 01 Feb 2017 15:40:51 +0100] rev 1797
merge with 5.6.0 Not extra change were needed from the mercurial-3.8 branch
Wed, 01 Feb 2017 15:32:59 +0100 merge with 5.6.0 mercurial-3.8
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 01 Feb 2017 15:32:59 +0100] rev 1796
merge with 5.6.0 A minor one line conflict on test output were encountered.
Wed, 01 Feb 2017 15:27:04 +0100 merge with 5.6.0 mercurial-3.9
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 01 Feb 2017 15:27:04 +0100] rev 1795
merge with 5.6.0 No extra changes needed from the 'mercurial-4.' branch.
Wed, 01 Feb 2017 15:15:34 +0100 merge with future 5.6.0 mercurial-4.0
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 01 Feb 2017 15:15:34 +0100] rev 1794
merge with future 5.6.0 There is only minor test output change, 4.0 do not have the "trouble:" wording in there.
Wed, 01 Feb 2017 16:09:40 +0100 Added tag 5.6.0 for changeset 99ede2d77545 stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 01 Feb 2017 16:09:40 +0100] rev 1793
Added tag 5.6.0 for changeset 99ede2d77545
Wed, 01 Feb 2017 16:05:21 +0100 exchange: fix compatibility layer stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 01 Feb 2017 16:05:21 +0100] rev 1792
exchange: fix compatibility layer We forgot a return into some compatibility layer. This is now fixed.
Wed, 01 Feb 2017 15:09:06 +0100 open the mercurial-3.9 compat branch mercurial-4.0
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 01 Feb 2017 15:09:06 +0100] rev 1791
open the mercurial-3.9 compat branch
Wed, 01 Feb 2017 15:08:03 +0100 prepare release 5.6.0 stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 01 Feb 2017 15:08:03 +0100] rev 1790
prepare release 5.6.0
Wed, 01 Feb 2017 15:07:30 +0100 debian: fix version format stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 01 Feb 2017 15:07:30 +0100] rev 1789
debian: fix version format There was a small error in the debian packaging
Wed, 01 Feb 2017 15:04:54 +0100 merge with default to prepare the next version stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 01 Feb 2017 15:04:54 +0100] rev 1788
merge with default to prepare the next version
Wed, 01 Feb 2017 15:02:59 +0100 merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 01 Feb 2017 15:02:59 +0100] rev 1787
merge with stable
Tue, 31 Jan 2017 12:32:45 -0800 uncommit: don't lose copy information of remaining files (issue5403) stable
Martin von Zweigbergk <martinvonz@google.com> [Tue, 31 Jan 2017 12:32:45 -0800] rev 1786
uncommit: don't lose copy information of remaining files (issue5403) As reported in the issue, "hg uncommit" would lose copy information of the files that remained in the commit. The problem was simply that the a dict of copies was iterated as "src, dst in copies.items()" where it should have been "dst, src ...".
Wed, 25 Jan 2017 16:50:19 +0100 merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 25 Jan 2017 16:50:19 +0100] rev 1785
merge with stable
Wed, 25 Jan 2017 16:40:45 +0100 fold: cleanly abort on empty fold set (issue5453) stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 25 Jan 2017 16:40:45 +0100] rev 1784
fold: cleanly abort on empty fold set (issue5453) We now handle the empty set case, cleanly aborting instead of crashing with a traceback. The message used match the output of 'hg push' in similar situation.
Mon, 23 Jan 2017 16:09:16 +0100 README: update changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 23 Jan 2017 16:09:16 +0100] rev 1783
README: update changelog
Thu, 12 Jan 2017 13:47:49 -0800 fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com> [Thu, 12 Jan 2017 13:47:49 -0800] rev 1782
fold: require --from flag for folding revisions to working copy It's very easy to think that "hg fold 4::6" will fold exactly those revisions. In reality, it will fold those *and* any revisions between them and the working copy. To prevent users from making that mistake, require the use of a new --from flag for folding revisions from the given set to the working copy. With this change, I'm sure some users will be surprised that the command can not be run without either --from or --exact, but at least the consequences will be smaller (the command simply aborts and the user can try again).
Tue, 13 Dec 2016 10:28:09 -0800 fold: use 'fold', not 'touch', for transaction description
Martin von Zweigbergk <martinvonz@google.com> [Tue, 13 Dec 2016 10:28:09 -0800] rev 1781
fold: use 'fold', not 'touch', for transaction description
Thu, 05 Jan 2017 01:36:37 -0800 tests: fix tests to reflect hg core changes
Stanislau Hlebik <stash@fb.com> [Thu, 05 Jan 2017 01:36:37 -0800] rev 1780
tests: fix tests to reflect hg core changes In f05ede08dcf7d13794ccc9abb53877a50bf2b58b in core hg there were changes to changeset_printer.
Wed, 23 Nov 2016 21:00:42 +0530 prune: improve error message if unstable changes are disallowed
Pulkit Goyal <7895pulkit@gmail.com> [Wed, 23 Nov 2016 21:00:42 +0530] rev 1779
prune: improve error message if unstable changes are disallowed I saw a question on stackoverflow why evolve reports something like cannot fold chain not ending with head. Even I was confused the first time about the behavior. The error message can be improved to avoid confusion to people who are unaware about the config in future.
Wed, 30 Nov 2016 11:17:55 +0000 wireproto: chunking and compression is forthwith to be handled by hgweb
Martijn Pieters <mjpieters@fb.com> [Wed, 30 Nov 2016 11:17:55 +0000] rev 1778
wireproto: chunking and compression is forthwith to be handled by hgweb Various functions disappeared in the process. Use the new streamres API but fall back to the old way if the keyword arguments are not accepted. See https://www.mercurial-scm.org/repo/hg/rev/2add671bf55b
Sun, 06 Nov 2016 19:19:28 +0100 readme: fix the test run command stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sun, 06 Nov 2016 19:19:28 +0100] rev 1777
readme: fix the test run command As we use the run-tests.py in Mercurial, we do not need to specify the path to a Mercurial utility.
Wed, 02 Nov 2016 18:56:44 +0100 Manifest.in: exclude unshipped extensions
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 02 Nov 2016 18:56:44 +0100] rev 1776
Manifest.in: exclude unshipped extensions Many extensions life in the repository without being shipped we exclude them from the dist tarball.
Wed, 02 Nov 2016 18:54:05 +0100 Manifest.in: include Manifest.in
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 02 Nov 2016 18:54:05 +0100] rev 1775
Manifest.in: include Manifest.in Apparently this file should be in the tarball.
Wed, 02 Nov 2016 18:53:49 +0100 Manifest.in: exclude debian related file
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 02 Nov 2016 18:53:49 +0100] rev 1774
Manifest.in: exclude debian related file The debian rules life in the repository for convenience, however they should not be included in the dist tarball.
(0) -1000 -300 -100 -50 -28 +28 +50 +100 +300 +1000 +3000 tip