Mercurial > evolve
comparison CHANGELOG @ 4839:485a9f3490c9
branching: merge with stable
There have been multiple fix on stable.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 10 Sep 2019 07:38:46 +0200 |
parents | 4c6dd20e8cc2 8a491546e81d |
children | 6f5d3f58fbe4 |
comparison
equal
deleted
inserted
replaced
4838:bc0ea7666d4d | 4839:485a9f3490c9 |
---|---|
12 * rewind: add --keep flag to preserve working copy | 12 * rewind: add --keep flag to preserve working copy |
13 | 13 |
14 9.1.1 - in progress | 14 9.1.1 - in progress |
15 ------------------- | 15 ------------------- |
16 | 16 |
17 * evolve: test that target is not orig in _solveunstable() (issue6097) | |
18 * fold: check allowdivergence before folding obsolete changesets (issue5817) | |
17 * obslog: correct spacing of patch output with word-diff=yes (issue6175) | 19 * obslog: correct spacing of patch output with word-diff=yes (issue6175) |
20 * stack: make sure to preserve dependencies, fixes certain complex cases | |
18 | 21 |
19 9.1.0 -- 2019-07-29 | 22 9.1.0 -- 2019-07-29 |
20 ------------------- | 23 ------------------- |
21 | 24 |
22 * compatibility with upcoming Mercurial 5.1, | 25 * compatibility with upcoming Mercurial 5.1, |