Mercurial > evolve

log tests/test-evolve-abort-phasediv.t @ 6919:6859ed744625 mercurial-5.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Mon, 06 Feb 2023 21:38:31 +0400 Anton Shestakov test-compat: merge mercurial-5.6 into mercurial-5.5 mercurial-5.5
Mon, 06 Feb 2023 19:49:33 +0400 Anton Shestakov test-compat: merge mercurial-5.7 into mercurial-5.6 mercurial-5.6
Fri, 07 Oct 2022 18:14:58 -0400 Matt Harbison evolve: don't embed graft data when completing interrupted evolve operations
Tue, 12 Oct 2021 13:05:23 +0300 Anton Shestakov test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
Tue, 12 Oct 2021 11:32:36 +0300 Anton Shestakov test-compat: merge mercurial-5.7 into mercurial-5.6 mercurial-5.6
Tue, 21 Sep 2021 22:11:31 +0300 Anton Shestakov tests: add {instabilities} to the common glog alias
Mon, 20 Sep 2021 20:47:31 +0300 Anton Shestakov tests: move the most often used glog alias to common.sh
Mon, 20 Sep 2021 20:28:49 +0300 Anton Shestakov tests: source common.sh in more tests
Thu, 12 Aug 2021 22:01:05 +0200 Pierre-Yves David test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
Thu, 12 Aug 2021 22:00:49 +0200 Pierre-Yves David test-compat: merge mercurial-5.7 into mercurial-5.6 mercurial-5.6
Thu, 17 Jun 2021 11:26:49 +0300 Anton Shestakov evolve: hg commit has --message flag stable
Thu, 11 Mar 2021 14:22:45 +0800 Anton Shestakov test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
Thu, 11 Mar 2021 12:29:50 +0800 Anton Shestakov test-compat: merge stable into mercurial-5.6 mercurial-5.6
Thu, 15 Oct 2020 15:40:36 -0700 Martin von Zweigbergk evolve: when relocating, optionally first try to do it using in-memory merge
Sun, 31 Jan 2021 15:39:25 +0800 Anton Shestakov test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
Thu, 28 Jan 2021 18:48:36 +0800 Anton Shestakov tests: back out changeset b3d9e6c805d6 mercurial-5.6
Thu, 19 Nov 2020 08:28:45 -0800 Martin von Zweigbergk tests: update with more detailed exit codes
Sat, 31 Oct 2020 19:33:42 +0800 Anton Shestakov test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
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