Mercurial > evolve
comparison CHANGELOG @ 4857:86cdc5efd769
branching: merge with stable
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 27 Sep 2019 06:55:05 +0200 |
parents | 6f5d3f58fbe4 6d898fa6e5c3 |
children | 40795751be1c |
comparison
equal
deleted
inserted
replaced
4856:894f58f5b59b | 4857:86cdc5efd769 |
---|---|
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: check that relocating makes sense in _solvedivergent() (issue5958) | |
17 * evolve: test that target is not orig in _solveunstable() (issue6097) | 18 * evolve: test that target is not orig in _solveunstable() (issue6097) |
18 * fold: check allowdivergence before folding obsolete changesets (issue5817) | 19 * fold: check allowdivergence before folding obsolete changesets (issue5817) |
19 * obslog: correct spacing of patch output with word-diff=yes (issue6175) | 20 * obslog: correct spacing of patch output with word-diff=yes (issue6175) |
20 * stack: make sure to preserve dependencies, fixes certain complex cases | 21 * stack: make sure to preserve dependencies, fixes certain complex cases |
21 * prune: improve documentation for `--pair` | 22 * prune: improve documentation for `--pair` |