| Wed, 28 Mar 2018 17:13:08 +0530 |
Pulkit Goyal |
tests: add test about handling phase-divergent merges
|
changeset |
files
|
| Wed, 28 Mar 2018 14:11:13 +0530 |
Pulkit Goyal |
evolve: show a message when evolution leads to no changes to commit
|
changeset |
files
|
| Wed, 28 Mar 2018 13:48:34 +0530 |
Pulkit Goyal |
evolve: pass the instability category to relocate() and _finalizerelocate()
|
changeset |
files
|
| Wed, 28 Mar 2018 12:56:35 +0530 |
Pulkit Goyal |
tests: add more tests for solving phase-divergence using `hg evolve`
|
changeset |
files
|
| Sat, 24 Mar 2018 17:21:42 +0530 |
Pulkit Goyal |
evolve: handle interrupted phase-divergence resolution gracefully
|
changeset |
files
|
| Sat, 24 Mar 2018 16:41:14 +0530 |
Pulkit Goyal |
evolve: move logic to resolve phase-divergence in a new function
|
changeset |
files
|
| Sat, 24 Mar 2018 16:38:03 +0530 |
Pulkit Goyal |
evolve: store the precursor of phase-divergent in evolvestate
|
changeset |
files
|
| Sat, 24 Mar 2018 13:17:05 +0530 |
Pulkit Goyal |
evolve: move logic to complete interrupted relocation to new fn
|
changeset |
files
|
| Sat, 24 Mar 2018 12:58:12 +0530 |
Pulkit Goyal |
evolve: move logic to complete interrupted orphan resolution to new fn
|
changeset |
files
|
| Fri, 23 Mar 2018 19:36:08 +0530 |
Pulkit Goyal |
evolve: write data to evolvestate in case on conflicts in phase-divergence
|
changeset |
files
|
| Fri, 23 Mar 2018 19:16:25 +0530 |
Pulkit Goyal |
evolve: explicitly turn revs to list before storing into evolvestate
|
changeset |
files
|
| Fri, 23 Mar 2018 18:58:19 +0530 |
Pulkit Goyal |
tests: add tests of content+parent change creating phase-divergence
|
changeset |
files
|
| Fri, 23 Mar 2018 18:28:37 +0530 |
Pulkit Goyal |
tests: show first line of commit message in test-evolve-phase-divergence.t
|
changeset |
files
|
| Fri, 23 Mar 2018 17:49:26 +0530 |
Pulkit Goyal |
evolve: make sure bookmarks are moved after phase-divergence resolution
|
changeset |
files
|
| Fri, 23 Mar 2018 17:46:46 +0530 |
Pulkit Goyal |
evolve: use the new rebased changeset to resolve phase-divergence
|
changeset |
files
|