Mercurial > evolve

log tests/test-evolve-phase.t @ 5834:c2484b0217ee mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
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
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
Fri, 22 Jan 2021 11:04:55 +0100 Pierre-Yves David branching: merge stable into default
Thu, 19 Nov 2020 08:28:45 -0800 Martin von Zweigbergk tests: update with more detailed exit codes stable
Tue, 24 Nov 2020 18:04:40 -0800 Martin von Zweigbergk evolve: remove spurious "working directory is now at ..." messages stable
Thu, 19 Nov 2020 08:28:45 -0800 Martin von Zweigbergk tests: update with more detailed exit codes
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
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, 24 Apr 2019 15:59:02 +0200 Anton Shestakov evolve: don't update after instability resolution by default (BC)
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, 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
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
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
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, 21 Mar 2018 16:32:54 +0100 Pierre-Yves David test-compat: merge mercurial-4.3 into mercurial-4.2 mercurial-4.2
Wed, 21 Mar 2018 16:18:31 +0100 Pierre-Yves David test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Wed, 21 Mar 2018 16:06:17 +0100 Pierre-Yves David test-compat: merge stable into mercurial-4.4 mercurial-4.4
Mon, 29 Jan 2018 00:09:44 +0530 Pulkit Goyal evolve: show the updated working directory after `hg evolve --continue`
Sat, 27 Jan 2018 21:15:27 +0530 Pulkit Goyal evolve: add evolve info to cmdutil.afterresolvedstates
Tue, 16 Jan 2018 04:32:43 +0100 Pierre-Yves David branching: merge stable back into default
Tue, 16 Jan 2018 04:38:04 +0100 Pierre-Yves David test-compat: merge mercurial-4.3 into mercurial-4.2 mercurial-4.2
Tue, 16 Jan 2018 04:35:34 +0100 Pierre-Yves David test-compat: merge stable into mercurial-4.3 mercurial-4.3
Mon, 15 Jan 2018 19:52:00 +0100 Pierre-Yves David branching: backed out test output changes from core-1905aac253f0 stable
Thu, 11 Jan 2018 18:36:05 +0530 Pulkit Goyal evolve: use better words in conflict markers of `hg evolve`
Thu, 11 Jan 2018 18:38:09 +0530 Pulkit Goyal tests: add a test demonstrating we still use graft in conflict markers
Tue, 09 Jan 2018 15:39:47 +0530 Pulkit Goyal evolve: use phases.new-commit config to retain phase information (issue5720)
Tue, 09 Jan 2018 15:33:57 +0530 Pulkit Goyal tests: add a test demonstarting lose of phase in `hg evolve`
less more | (0) tip