Mercurial > evolve
comparison CHANGELOG @ 4483:7978230faa32 stable
evolve: make sure div resolution don't replace the initial author (issue6113)
Before this patch, divergence resolution logic taking the current user who
is running the resolution command as the author of commit that will
be created after merging the two divergent csets.
This patch make sure that we preserve the initial author.
Changes in test file reflect the fixed behaviour.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Wed, 10 Apr 2019 15:37:29 +0200 |
| parents | d18044dfc584 |
| children | 099e0ca8285e |
comparison
equal
deleted
inserted
replaced
| 4482:ee7e4e05ce44 | 4483:7978230faa32 |
|---|---|
| 8 * evolve: fix an recoverable state (issue6053) | 8 * evolve: fix an recoverable state (issue6053) |
| 9 * prune: fix error message when pruning public changesets | 9 * prune: fix error message when pruning public changesets |
| 10 * touch: fix error message when touching public changesets | 10 * touch: fix error message when touching public changesets |
| 11 * evolve: make sure the extensions are only active on repository that | 11 * evolve: make sure the extensions are only active on repository that |
| 12 enables it. Double check your server configuration (issue6057) | 12 enables it. Double check your server configuration (issue6057) |
| 13 * evolve: make sure divergence resolution don't replace the initial author | |
| 14 (issue6113) | |
| 13 | 15 |
| 14 8.4.0 -- 2019-12-22 | 16 8.4.0 -- 2019-12-22 |
| 15 ------------------- | 17 ------------------- |
| 16 | 18 |
| 17 * compat: add compatibility with Mercurial 4.9 | 19 * compat: add compatibility with Mercurial 4.9 |