Sat, 24 Mar 2018 12:58:12 +0530 | Pulkit Goyal | evolve: move logic to complete interrupted orphan resolution to new fn | file | diff | annotate |
Fri, 23 Mar 2018 19:36:08 +0530 | Pulkit Goyal | evolve: write data to evolvestate in case on conflicts in phase-divergence | file | diff | annotate |
Fri, 23 Mar 2018 18:58:19 +0530 | Pulkit Goyal | tests: add tests of content+parent change creating phase-divergence | file | diff | annotate |
Fri, 23 Mar 2018 18:28:37 +0530 | Pulkit Goyal | tests: show first line of commit message in test-evolve-phase-divergence.t | file | diff | annotate |
Fri, 23 Mar 2018 17:49:26 +0530 | Pulkit Goyal | evolve: make sure bookmarks are moved after phase-divergence resolution | file | diff | annotate |
Fri, 23 Mar 2018 17:46:46 +0530 | Pulkit Goyal | evolve: use the new rebased changeset to resolve phase-divergence | file | diff | annotate |
Fri, 23 Mar 2018 17:20:20 +0530 | Pulkit Goyal | tests: add one more test case about handling of phase-divergence by evolve | file | diff | annotate |