Mercurial > evolve

log tests/test-evolve-phase-divergence.t @ 4173:e268f7fd7839 mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Fri, 12 Oct 2018 15:15:09 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Fri, 12 Oct 2018 15:15:05 +0200 Pierre-Yves David test-compat: merge stable into mercurial-4.6 mercurial-4.6
Fri, 12 Oct 2018 14:55:46 +0200 Pierre-Yves David test: backed out test output changes from changeset ef22eef37ecc stable
Wed, 12 Sep 2018 11:53:41 +0200 Pierre-Yves David test: update output to match new "pull" phase report
Fri, 03 Aug 2018 00:22:50 +0200 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Thu, 02 Aug 2018 02:47:44 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Tue, 31 Jul 2018 11:47:20 +0200 Pierre-Yves David test-compat: backed out changeset 41fc764bf28c mercurial-4.6
Tue, 31 Jul 2018 11:46:30 +0200 Pierre-Yves David test-compat: backed out changeset dda5b2134b32 mercurial-4.6
Fri, 15 Jun 2018 00:16:29 +0530 Pulkit Goyal evolve: raise error.InterventionRequired instead of Abort when conflicts
Tue, 12 Jun 2018 19:00:12 +0530 Pulkit Goyal evolve: improve error messages when conflicts occur
Sun, 10 Jun 2018 20:58:55 +0530 Pulkit Goyal tests: update tests output with changes in d0abd7949ea3 in core hg
Sun, 03 Jun 2018 01:59:41 +0530 Pulkit Goyal corecompat: update the tests output to show phase update summary
Wed, 25 Apr 2018 01:58:45 +0100 Pierre-Yves David testcompat: update output for Mercurial 4.3 mercurial-4.3
Mon, 23 Apr 2018 12:23:00 +0200 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Mon, 23 Apr 2018 12:11:10 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Sun, 22 Apr 2018 11:40:17 +0200 Pierre-Yves David evolve: point to '--abort' in error message
Wed, 28 Mar 2018 17:13:08 +0530 Pulkit Goyal tests: add test about handling phase-divergent merges
Wed, 28 Mar 2018 12:56:35 +0530 Pulkit Goyal tests: add more tests for solving phase-divergence using `hg evolve`
Sat, 24 Mar 2018 17:21:42 +0530 Pulkit Goyal evolve: handle interrupted phase-divergence resolution gracefully
Sat, 24 Mar 2018 12:58:12 +0530 Pulkit Goyal evolve: move logic to complete interrupted orphan resolution to new fn
Fri, 23 Mar 2018 19:36:08 +0530 Pulkit Goyal evolve: write data to evolvestate in case on conflicts in phase-divergence
Fri, 23 Mar 2018 18:58:19 +0530 Pulkit Goyal tests: add tests of content+parent change creating phase-divergence
Fri, 23 Mar 2018 18:28:37 +0530 Pulkit Goyal tests: show first line of commit message in test-evolve-phase-divergence.t
Fri, 23 Mar 2018 17:49:26 +0530 Pulkit Goyal evolve: make sure bookmarks are moved after phase-divergence resolution
Fri, 23 Mar 2018 17:46:46 +0530 Pulkit Goyal evolve: use the new rebased changeset to resolve phase-divergence
Fri, 23 Mar 2018 17:20:20 +0530 Pulkit Goyal tests: add one more test case about handling of phase-divergence by evolve
Fri, 23 Mar 2018 15:27:26 +0530 Pulkit Goyal tests: add more tests for handling of phase divergence by `hg evolve`
Fri, 23 Mar 2018 13:16:42 +0530 Pulkit Goyal tests: temporary delete the merge test of handling phase divergence
Fri, 30 Mar 2018 19:38:55 +0200 Pulkit Goyal tests: various comment on test-evolve-phase-divergence
Fri, 30 Mar 2018 19:37:06 +0200 Pulkit Goyal tests: make test-evolve-phase-divergence more descriptive
Fri, 23 Mar 2018 12:44:06 +0530 Pulkit Goyal tests: rename test-evolve-bumped to test-evolve-phase-divergence.t base tests/test-evolve-bumped.t@6fe2255cccb2
less more | (0) tip