Mercurial > evolve

log tests/test-evolve-abort-orphan.t @ 6041:6b7ef731141b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
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, 11 Mar 2021 14:42:51 +0800 Anton Shestakov test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
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 13:27:18 +0800 Anton Shestakov test-compat: merge mercurial-5.4 into mercurial-5.3 mercurial-5.3
Thu, 11 Mar 2021 12:51:00 +0800 Anton Shestakov tests: remove in-memory evolve cases (not supported prior to 5.6) mercurial-5.5
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 16:06:16 +0800 Anton Shestakov test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Sun, 31 Jan 2021 15:39:25 +0800 Anton Shestakov test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
Sat, 30 Jan 2021 20:49:07 +0800 Anton Shestakov test-compat: merge mercurial-5.4 into mercurial-5.3 mercurial-5.3
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:43:46 +0800 Anton Shestakov test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Sat, 31 Oct 2020 19:33:42 +0800 Anton Shestakov test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
Sat, 31 Oct 2020 18:55:21 +0800 Anton Shestakov tests: adjust test output after b2de5825e5ca for older Mercurial mercurial-5.3
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:16 +0200 Pierre-Yves David test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
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
Mon, 29 Jul 2019 14:43:12 +0200 Pierre-Yves David test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Sat, 08 Jun 2019 16:09:37 +0800 Anton Shestakov evolve: correct action verb in a message
Thu, 06 Jun 2019 17:37:42 +0800 Anton Shestakov evolvecmd: the proper way to deal with conflicts is to resolve them
Wed, 05 Jun 2019 17:56:44 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Wed, 05 Jun 2019 17:39:32 +0200 Pierre-Yves David test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Thu, 25 Apr 2019 15:14:21 -0700 Martin von Zweigbergk messages: standardize on "working copy is now at" including "is"
Sun, 14 Apr 2019 02:18:19 +0800 Anton Shestakov tests: add --update to hg evolve to reduce test changes for the next patch
Sat, 20 Apr 2019 03:55:11 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Sat, 20 Apr 2019 03:55:06 +0200 Pierre-Yves David test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Tue, 22 Jan 2019 12:57:25 -0500 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Tue, 04 Dec 2018 13:33:51 +0100 Pierre-Yves David test: adapt to change output change on default
Fri, 12 Oct 2018 15:20:54 +0200 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
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, 21 Sep 2018 15:52:53 +0530 Sushil khanchi evovle: remove redundancy in evolve output
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
Mon, 20 Aug 2018 12:21:39 +0300 Pulkit Goyal evolve: delete evolvestate after aborting interrupted `next --evolve` stable
Mon, 20 Aug 2018 12:19:05 +0300 Pulkit Goyal tests: check that we delete evolvestate correctly after abort/stop stable
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)
Mon, 11 Jun 2018 01:12:12 +0530 Pulkit Goyal evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
Wed, 06 Jun 2018 04:09:49 +0530 Pulkit Goyal evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
Tue, 05 Jun 2018 03:37:15 +0200 Pierre-Yves David branching: merge with stable base tests/test-evolve-abort.t@65621751d5a1
Wed, 23 May 2018 01:27:13 +0530 Pulkit Goyal tests: rename test-evolve-abort.t to test-evolve-abort-orphan.t base tests/test-evolve-abort.t@321b6ee1bafe
less more | (0) tip