Mercurial > evolve
comparison CHANGELOG @ 5086:553b2f2fda93 mercurial-5.1
test-compat: merge mercurial-5.2 into mercurial-5.1
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 23 Jan 2020 17:40:51 +0700 |
| parents | 47f9ba943bb1 |
| children | 25fc1a2c3dc6 |
comparison
equal
deleted
inserted
replaced
| 4967:844c9eb2400f | 5086:553b2f2fda93 |
|---|---|
| 7 * pick: don't create any successors when there were no changes (issue6093), | 7 * pick: don't create any successors when there were no changes (issue6093), |
| 8 * metaedit: don't change commit date by default (issue5994), | 8 * metaedit: don't change commit date by default (issue5994), |
| 9 * rewind: preserve date | 9 * rewind: preserve date |
| 10 * py3: fix setup.py --version | 10 * py3: fix setup.py --version |
| 11 * py3: fix documentation generation | 11 * py3: fix documentation generation |
| 12 * py3: fix some exception formatting | |
| 12 * debian: allow to build with python 3 | 13 * debian: allow to build with python 3 |
| 13 * topic: add more options to command synopsis string | 14 * topic: add more options to command synopsis string |
| 14 * evolve: use more often seen metavariables in command synopsis strings | 15 * evolve: use more often seen metavariables in command synopsis strings |
| 15 * documentation: update text and add missing figures | 16 * documentation: update text and add missing figures |
| 17 * amend: cleany abort when both `--patch` and `--extract` are passed | |
| 18 * evolve: also merge the date field when solving content-divergence | |
| 19 * compatibility for changes in upcoming Mercurial 5.3 | |
| 20 * evolve: fix content-divergence resolution when p1 is null (issue6201) | |
| 21 * evolve: make sure divergence resolution doesn't undo changes (issue6203) | |
| 22 * evolve: preserve date when resolving content-divergence (issue6202) | |
| 23 * topic: fix a bug in logic of choosing destination for hg update | |
| 24 * topic: fix a bug in logic to choose destination when no active topic | |
| 16 | 25 |
| 17 9.2.1 -- 2019-10-05 | 26 9.2.1 -- 2019-10-05 |
| 18 ------------------- | 27 ------------------- |
| 19 | 28 |
| 20 * setup: fix install on python 3 | 29 * setup: fix install on python 3 |