| Thu, 07 Jun 2018 22:59:39 +0530 |
Pulkit Goyal |
evolve: store the evolvestate if relocation results in conflicts
|
| Thu, 07 Jun 2018 22:45:54 +0530 |
Pulkit Goyal |
tests: add more test of resolution of content-divergent changesets
|
| Thu, 07 Jun 2018 18:18:10 +0530 |
Pulkit Goyal |
evolvestate: store info about relocation while resolving content-divergence
|
| Thu, 07 Jun 2018 18:13:54 +0530 |
Pulkit Goyal |
evolve: factor out logic to merge content divergent csets in separate fn
|
| Thu, 07 Jun 2018 20:27:03 +0530 |
Pulkit Goyal |
evolve: commit the transaction if conflicts occur while merging content-div
|
| Thu, 07 Jun 2018 15:54:32 +0530 |
Pulkit Goyal |
tests: add tests for resolving content-divergence when different parents
|
| Fri, 01 Jun 2018 19:52:06 +0530 |
Pulkit Goyal |
evolve: implement resolution of content-divergence when on differet parents
|
| Fri, 01 Jun 2018 19:57:19 +0530 |
Pulkit Goyal |
tests: add tests for resolving content-divergence with parent change
|
| Wed, 06 Jun 2018 03:49:17 +0530 |
Pulkit Goyal |
CHANGELOG: add an entry about fixing issue5877
|
| Wed, 06 Jun 2018 03:26:47 +0530 |
Pulkit Goyal |
evolve: pop up editor if conflicts occur while merging commit messages
|
| Mon, 04 Jun 2018 01:28:02 +0530 |
Pulkit Goyal |
evolve: merge commit messages while resolving content-divergence (issue5877)
|
| Wed, 06 Jun 2018 01:19:36 +0530 |
Pulkit Goyal |
evolve: move if-else block under the right block
|
| Tue, 05 Jun 2018 22:02:24 +0530 |
Pulkit Goyal |
tests: make sure we don't result in commit messages conflict
|
| Tue, 05 Jun 2018 21:02:09 +0530 |
Pulkit Goyal |
tests: don't use mkcommit shell function in test-divergent.t
|
