Mercurial > evolve

log tests/test-evolve-abort-phasediv.t @ 5571:b2de5825e5ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Fri, 25 Sep 2020 11:06:46 -0700 Martin von Zweigbergk evolve: don't set evolved node as dirstate p2
Fri, 27 Sep 2019 13:03:12 +0200 Pierre-Yves David test-compat: merge stable into mercurial-5.0 mercurial-5.0
Thu, 11 Jul 2019 22:56:46 +0530 Taapas Agrawal abort: added support for evolve to hg abort
Thu, 06 Jun 2019 17:37:42 +0800 Anton Shestakov evolvecmd: the proper way to deal with conflicts is to resolve them
Thu, 11 Apr 2019 22:44:53 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Tue, 26 Mar 2019 12:30:10 +0100 Pierre-Yves David evolve: drop the "computing new diff message" for phase-divergence
Wed, 20 Mar 2019 09:19:02 -0700 Martin von Zweigbergk evolve: clarify output when phase-divergence resolution results in no change
Tue, 22 Jan 2019 12:57:25 -0500 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Mon, 03 Sep 2018 22:09:26 +0200 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Mon, 03 Sep 2018 22:06:12 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Fri, 31 Aug 2018 09:21:19 +0200 Pierre-Yves David pick: replace `hg grab` invocation in test with `hg pick`
Fri, 31 Aug 2018 09:13:11 +0200 Pierre-Yves David pick: update command output to mention pick instead of grab
Tue, 21 Aug 2018 14:09:33 +0200 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Tue, 21 Aug 2018 13:26:35 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Sat, 18 Aug 2018 21:03:45 +0530 Pulkit Goyal evolve: set the second parent if we get conflicts while evolving stable
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
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
Wed, 06 Jun 2018 04:29:05 +0530 Pulkit Goyal evolve: show unfinished information in `hg status -v` (issue5886)
Thu, 24 May 2018 00:58:50 +0530 Pulkit Goyal evolve: fix storage of replacements and temprevs node in evolvestate
Thu, 24 May 2018 00:58:35 +0530 Pulkit Goyal tests: add more tests related to aborting while resolving phase-divergence
Wed, 23 May 2018 02:46:20 +0530 Pulkit Goyal evolve: make `--abort` strip the temporary revs created during resolution
Wed, 23 May 2018 02:36:14 +0530 Pulkit Goyal evolve: check for None before adding in set of revisions to strip
Wed, 23 May 2018 02:41:08 +0530 Pulkit Goyal tests: add a test file `--abort` flag while resolving phase-divergence
less more | (0) tip