| Fri, 07 Oct 2022 18:14:58 -0400 |
Matt Harbison |
evolve: don't embed graft data when completing interrupted evolve operations
|
| 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:29:50 +0800 |
Anton Shestakov |
test-compat: merge stable into mercurial-5.6
mercurial-5.6
|
| Wed, 03 Mar 2021 10:57:09 +0800 |
Anton Shestakov |
tests: remove some unnecessary config
|
| 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 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
|
| Sun, 14 Apr 2019 02:18:19 +0800 |
Anton Shestakov |
tests: add --update to hg evolve to reduce test changes for the next patch
|
| 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, 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
|
| Fri, 20 Oct 2017 19:32:18 +0200 |
Pierre-Yves David |
test-compat: revert output changes related to temporary amend commit
mercurial-4.3
|
| Fri, 20 Oct 2017 17:23:12 +0200 |
Pierre-Yves David |
test-compat: revert output change from using core obsfate
mercurial-4.3
|
| Fri, 20 Oct 2017 12:04:45 +0200 |
Pierre-Yves David |
obsfate: use core version of obsfate if available
|
| Wed, 27 Sep 2017 16:26:30 +0200 |
Pierre-Yves David |
packaging: merge stable back into default
|
| Wed, 27 Sep 2017 01:18:39 +0200 |
Pierre-Yves David |
compat-test: merge future 6.7.0 into 4.0 compat branch
mercurial-4.0
|
| Wed, 27 Sep 2017 01:07:22 +0200 |
Pierre-Yves David |
compat-test: merge future 6.7.0 into 4.2 compat branch
mercurial-4.2
|
| Wed, 27 Sep 2017 00:54:28 +0200 |
Pierre-Yves David |
branching: merge future 6.7.0 in the stable branch
stable
|
| Fri, 15 Sep 2017 15:48:18 +0200 |
Boris Feld |
tests: update after removing of redundant amend commit
|
| Wed, 09 Aug 2017 11:32:19 +0200 |
Boris Feld |
obsfate: use effect flag information for computing a better verb
|
| Thu, 24 Aug 2017 09:11:06 +0200 |
Boris Feld |
warning: rename unstable warning message
|
| Thu, 10 Aug 2017 17:37:31 +0200 |
Boris Feld |
log: unstable was renamed into orphan
|
| Thu, 10 Aug 2017 17:31:23 +0200 |
Boris Feld |
log: trouble was renamed into instability
|
| Tue, 25 Jul 2017 04:00:17 +0200 |
Pierre-Yves David |
test-compat: merge with mercurial-4.1
mercurial-4.0
|
| Tue, 25 Jul 2017 03:41:15 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 with the new stable branch content
mercurial-4.2
|
| Sun, 02 Jul 2017 19:43:44 +0200 |
Pierre-Yves David |
merge back with stable
|
| Sun, 02 Jul 2017 17:28:15 +0200 |
Pierre-Yves David |
compat: merge with mercurial-4.1
mercurial-4.0
|
