comparison CHANGELOG @ 6050:bec2d792ceae

branching: merge stable into default
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 09:57:52 +0300
parents 441e7e773d6c 6c67219ce779
children 21e43f87f837
comparison
equal deleted inserted replaced
6049:441e7e773d6c 6050:bec2d792ceae
18 18
19 * evolve, topic, pullbundle: drop compatibility with Mercurial 4.6 19 * evolve, topic, pullbundle: drop compatibility with Mercurial 4.6
20 20
21 topic (0.23.0) 21 topic (0.23.0)
22 22
23 * topic: don't cache .topic() of memctx instances, as that could produce
24 KeyError: b'topic' during some rewrite operations (issue6500)
23 * topic: drop old code for working with amends on ancient hg versions (~3.6) 25 * topic: drop old code for working with amends on ancient hg versions (~3.6)
24 26
25 10.3.3 -- 2021-08-13 27 10.3.3 -- 2021-08-13
26 -------------------- 28 --------------------
27 29
28 * evolve: compatibility with Mercurial 5.9 30 * evolve: compatibility with Mercurial 5.9
29 * fold: make sure to save commit messages in last-message.txt, also affects 31 * fold: make sure to save commit messages in last-message.txt, also affects
30 metaedit (issue6549) 32 metaedit (issue6549)
31 * touch: fix `hg touch` on merge commits
32
33 topic (0.22.3)
34
35 * topic: correctly update from public commits with a (now hidden) topic
36 when hg update is called without any revision (issue6553)
37 * topic: fix the help text to show how to disable publishing
38
39
40 10.3.2 -- 2021-05-28
41 --------------------
42
43 * next: remove duplicated targets when updating from an unstable changeset
44 * evolve: use "served" repo filter to guess what the server will publish
45 * touch/fold/metaedit/rewind: no longer lose changes from merge commits 33 * touch/fold/metaedit/rewind: no longer lose changes from merge commits
46 (issue6416). As a consequence (for technical reasons), when run with 34 (issue6416). As a consequence (for technical reasons), when run with
47 Mercurial 5.5 and earlier, these commands now require there to be no 35 Mercurial 5.5 and earlier, these commands now require there to be no
48 unresolved conflicts. 36 unresolved conflicts.
49 37
38 topic (0.22.3)
39
40 * topic: correctly update from public commits with a (now hidden) topic
41 when hg update is called without any revision (issue6553)
42 * topic: fix the help text to show how to disable publishing
43
44
45 10.3.2 -- 2021-05-28
46 --------------------
47
48 * next: remove duplicated targets when updating from an unstable changeset
49 * evolve: use "served" repo filter to guess what the server will publish
50 50
51 topic (0.22.2) 51 topic (0.22.2)
52 52
53 * topic: don't lose any file changes when changing topic of a merge commit 53 * topic: don't lose any file changes when changing topic of a merge commit
54 * topic: announce ext-topics-publish capability in case of SSH and HTTP too 54 * topic: announce ext-topics-publish capability in case of SSH and HTTP too