log tests/test-evolve-abort-contentdiv.t @ 4274:bc612c43ca84 mercurial-4.5

age author description
Tue, 21 Aug 2018 13:25:28 +0200 Pierre-Yves David test-compat: merge stable into mercurial-4.6 mercurial-4.6
Sat, 18 Aug 2018 20:24:41 +0530 Pulkit Goyal tests: demonstrate the interrupted evolve does not set p2 stable
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:45:01 +0200 Pierre-Yves David test-compat: backout change to 1e103c7f7663 mercurial-4.6
Fri, 15 Jun 2018 00:50:17 +0530 Pulkit Goyal evolve: make one missed error to align other error messages
Fri, 15 Jun 2018 00:16:29 +0530 Pulkit Goyal evolve: raise error.InterventionRequired instead of Abort when conflicts
Wed, 13 Jun 2018 17:15:10 +0530 Pulkit Goyal evolve: create a new commit instead of amending one of the divergents
Tue, 12 Jun 2018 04:01:19 +0530 Pulkit Goyal evolve: point to `hg help evolve.interrupted` while resolving content-div
Tue, 12 Jun 2018 03:29:13 +0530 Pulkit Goyal tests: add test about aborting content-divergence when multiple parents
Wed, 06 Jun 2018 04:29:05 +0530 Pulkit Goyal evolve: show unfinished information in `hg status -v` (issue5886)
Mon, 11 Jun 2018 20:17:56 +0530 Pulkit Goyal evolve: strip the extra obsmarkers if any on `hg evolve --abort`
Thu, 24 May 2018 02:12:14 +0530 Pulkit Goyal evolve: return the new node formed only as the replacement
Thu, 24 May 2018 17:04:20 +0530 Pulkit Goyal tests: add more test of --abort flag for content-divergence resolution
Thu, 24 May 2018 02:02:11 +0530 Pulkit Goyal tests: add tests for testing --abort while content-divergence resolution