| Thu, 02 Aug 2018 02:47:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Tue, 31 Jul 2018 11:47:20 +0200 |
Pierre-Yves David |
test-compat: backed out changeset 41fc764bf28c
mercurial-4.6
|
file |
diff |
annotate
|
| Tue, 31 Jul 2018 11:46:30 +0200 |
Pierre-Yves David |
test-compat: backed out changeset dda5b2134b32
mercurial-4.6
|
file |
diff |
annotate
|
| Fri, 15 Jun 2018 00:16:29 +0530 |
Pulkit Goyal |
evolve: raise error.InterventionRequired instead of Abort when conflicts
|
file |
diff |
annotate
|
| Tue, 12 Jun 2018 19:00:12 +0530 |
Pulkit Goyal |
evolve: improve error messages when conflicts occur
|
file |
diff |
annotate
|
| Sun, 10 Jun 2018 20:58:55 +0530 |
Pulkit Goyal |
tests: update tests output with changes in d0abd7949ea3 in core hg
|
file |
diff |
annotate
|
| Sun, 03 Jun 2018 01:59:41 +0530 |
Pulkit Goyal |
corecompat: update the tests output to show phase update summary
|
file |
diff |
annotate
|
| Wed, 25 Apr 2018 01:58:45 +0100 |
Pierre-Yves David |
testcompat: update output for Mercurial 4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Mon, 23 Apr 2018 12:23:00 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Mon, 23 Apr 2018 12:11:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Sun, 22 Apr 2018 11:40:17 +0200 |
Pierre-Yves David |
evolve: point to '--abort' in error message
|
file |
diff |
annotate
|
| Wed, 28 Mar 2018 17:13:08 +0530 |
Pulkit Goyal |
tests: add test about handling phase-divergent merges
|
file |
diff |
annotate
|
| Wed, 28 Mar 2018 12:56:35 +0530 |
Pulkit Goyal |
tests: add more tests for solving phase-divergence using `hg evolve`
|
file |
diff |
annotate
|
| Sat, 24 Mar 2018 17:21:42 +0530 |
Pulkit Goyal |
evolve: handle interrupted phase-divergence resolution gracefully
|
file |
diff |
annotate
|
| 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
|
| Fri, 23 Mar 2018 15:27:26 +0530 |
Pulkit Goyal |
tests: add more tests for handling of phase divergence by `hg evolve`
|
file |
diff |
annotate
|
| Fri, 23 Mar 2018 13:16:42 +0530 |
Pulkit Goyal |
tests: temporary delete the merge test of handling phase divergence
|
file |
diff |
annotate
|
| Fri, 30 Mar 2018 19:38:55 +0200 |
Pulkit Goyal |
tests: various comment on test-evolve-phase-divergence
|
file |
diff |
annotate
|
| Fri, 30 Mar 2018 19:37:06 +0200 |
Pulkit Goyal |
tests: make test-evolve-phase-divergence more descriptive
|
file |
diff |
annotate
|
| Fri, 23 Mar 2018 12:44:06 +0530 |
Pulkit Goyal |
tests: rename test-evolve-bumped to test-evolve-phase-divergence.t
|
file |
diff |
annotate
| base
|