Mercurial > evolve
view debian/docs @ 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 | d1ca81f9e458 |
| children | 9e0f91cb5242 |