log tests/test-stabilize-conflict.t @ 3995:684cc3418ecd mercurial-4.4

age author description
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, 12 Mar 2018 23:26:25 -0700 Martin von Zweigbergk tests: do not glob out fixed dates
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: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
Tue, 16 Jan 2018 04:32:43 +0100 Pierre-Yves David branching: merge stable back into default
Mon, 15 Jan 2018 19:52:00 +0100 Pierre-Yves David branching: backed out test output changes from core-1905aac253f0 stable
Sat, 06 Jan 2018 18:48:15 +0530 Pulkit Goyal evolve: don't use graftstate for continuing `hg evolve`
Fri, 05 Jan 2018 09:23:09 +0100 Boris Feld test: update output to 9b3f95d9783d
Fri, 20 Oct 2017 22:54:58 +0200 Pierre-Yves David test-compat: merge future 6.7.0 in mercurial-4.0 branch mercurial-4.0
Fri, 20 Oct 2017 22:54:08 +0200 Pierre-Yves David test-compat: merge future 6.7.0 in mercurial-4.2 branch mercurial-4.2
Fri, 20 Oct 2017 22:52:55 +0200 Pierre-Yves David test-compat: merge future 6.7.0 in mercurial-4.3 branch mercurial-4.3
Fri, 20 Oct 2017 22:44:12 +0200 Pierre-Yves David obsfate: re-enables operation display in obsfate stable
Fri, 20 Oct 2017 18:43:55 +0200 Pierre-Yves David test-compat: merge with mercurial-4.1 branch mercurial-4.0
Fri, 20 Oct 2017 18:34:22 +0200 Pierre-Yves David test-compat: merge with mercurial-4.3 branch mercurial-4.2
Fri, 20 Oct 2017 20:04:13 +0200 Pierre-Yves David test-compat: revert output changes from phase renaming mercurial-4.3