Mercurial Mercurial > pub > hg > evolve / changelog
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | zip | gz | bz2 | help
(0) -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sat, 23 Feb 2019 15:17:55 +0100 pick: update working dir branch (issue6089) stable
changeset
Manuel Jacob <me@manueljacob.de> [Sat, 23 Feb 2019 15:17:55 +0100] rev 4485
pick: update working dir branch (issue6089) Previously the working copy was left in an "inconsistent" state.
Wed, 10 Apr 2019 15:47:28 +0200 tests: rename test-grab to test-pick stable
changeset
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 10 Apr 2019 15:47:28 +0200] rev 4484
tests: rename test-grab to test-pick This match the new command name.
Wed, 10 Apr 2019 15:37:29 +0200 evolve: make sure div resolution don't replace the initial author (issue6113) stable
changeset
Sushil khanchi <sushilkhanchi97@gmail.com> [Wed, 10 Apr 2019 15:37:29 +0200] rev 4483
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.
(0) -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 tip
evolve