Wed, 21 Mar 2018 16:06:17 +0100 | Pierre-Yves David | test-compat: merge stable into mercurial-4.4 | file | diff | annotate |
Sun, 18 Mar 2018 17:29:32 +0530 | Pulkit Goyal | evolve: handle stabilization of merge changeset with both parents obsoleted | file | diff | annotate |
Mon, 19 Mar 2018 12:58:31 +0530 | Pulkit Goyal | evolve: preserve the order of merge parents in `hg evolve --continue` | file | diff | annotate |
Mon, 19 Mar 2018 14:03:41 +0100 | Pulkit Goyal | tests: add more cases about stabilization of an orphaned merge commit | file | diff | annotate |
Tue, 13 Mar 2018 19:06:14 +0530 | Pulkit Goyal | tests: add more tests related to stabilization of orphaned merge commit | file | diff | annotate |
Tue, 13 Mar 2018 18:17:50 +0530 | Pulkit Goyal | evolve: fix stabilization of orphan merge changesets in case of conflicts | file | diff | annotate |
Tue, 13 Mar 2018 15:29:35 +0530 | Pulkit Goyal | tests: add a test file of resolving orphaness of merge changesets | file | diff | annotate |