| 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
|
| Sun, 02 Jul 2017 17:24:56 +0200 |
Pierre-Yves David |
merge: default into stable to prepare next version
stable
|
| Mon, 26 Jun 2017 17:20:08 +0200 |
Boris Feld |
obsfate: override the default log output
|
| Tue, 14 Mar 2017 14:38:10 -0700 |
Pierre-Yves David |
mercurial-4.0: merge with future 6.0.0
mercurial-4.0
|
| Tue, 28 Feb 2017 15:09:03 +0100 |
Pierre-Yves David |
evolve: move the extensions to 'hgext3rd'
|
| Wed, 01 Feb 2017 15:51:02 +0100 |
Pierre-Yves David |
merge with 5.6.0
mercurial-3.5
|
| Wed, 01 Feb 2017 15:15:34 +0100 |
Pierre-Yves David |
merge with future 5.6.0
mercurial-4.0
|
| Thu, 05 Jan 2017 01:36:37 -0800 |
Stanislau Hlebik |
tests: fix tests to reflect hg core changes
|
| Sat, 29 Oct 2016 15:04:23 +0200 |
Pierre-Yves David |
merge with latest fix
mercurial-3.5
|
| Fri, 28 Oct 2016 17:15:57 -0700 |
Martin von Zweigbergk |
evolve: use single quotes in usage messages
stable
|
| Fri, 28 Oct 2016 15:04:40 -0700 |
Martin von Zweigbergk |
evolve: suggest "hg update -C .", including '.', to abort evolve
stable
|
| Thu, 04 Feb 2016 11:07:44 +0000 |
Pierre-Yves David |
tests: register expected difference for Mercurial 3.5
mercurial-3.5
|
| Wed, 03 Feb 2016 23:21:50 +0000 |
Pierre-Yves David |
test: back hash change from 'extra' content change out
|
| Fri, 04 Dec 2015 14:00:48 -0800 |
Laurent Charignon |
evolve: fix test-stabilize-conflict.t to match new extra computation in core
|
| Fri, 30 Oct 2015 15:48:13 +0000 |
Pierre-Yves David |
tests: run test with 3.6 and apply test change
|
| Fri, 19 Jun 2015 10:44:25 -0700 |
Pierre-Yves David |
evolve: add a hint about how to abort an evolve with conflict
stable
|
| Sun, 14 Dec 2014 12:19:40 -0800 |
Pierre-Yves David |
test: adapt to core change in graft and rebase
|
| Sat, 13 Dec 2014 18:19:12 -0800 |
Pierre-Yves David |
evolve: remove the dependency to the rebase extension
stable
|
| Mon, 17 Nov 2014 16:04:48 +0100 |
Pierre-Yves David |
test: ensure we echo prompt
stable
|
| Thu, 16 Oct 2014 04:38:37 -0700 |
Pierre-Yves David |
evolve: adapt to change in core rebase
|
| Thu, 02 Oct 2014 15:53:54 -0500 |
Pierre-Yves David |
test: adapt to core mercurial 9ab18a912c44
|
| Fri, 29 Aug 2014 14:26:17 +0200 |
David Soria Parra |
evolve: write a status message when the working directory changes
stable
|
| Fri, 08 Aug 2014 15:55:04 -0700 |
Pierre-Yves David |
merge with stable
|
| Fri, 08 Aug 2014 10:40:47 -0700 |
Pierre-Yves David |
test: apply message changes introduced by mercurial 3.1
stable
|
| Tue, 29 Jul 2014 17:15:01 -0700 |
Pierre-Yves David |
test: adapt to upstream message change
|
| Sun, 22 Jun 2014 20:10:07 -0400 |
Greg Ward |
evolve: add --tool option so we don't have to use HGMERGE
|
| Sat, 21 Jun 2014 18:31:21 -0400 |
Greg Ward |
tests: fix grammar, spelling, punctuation in comments
|
| Mon, 02 Jun 2014 15:22:23 -0700 |
Pierre-Yves David |
test: update to output change introduced by future 3.1
|
| Fri, 04 Apr 2014 00:58:15 +0200 |
Olle Lundberg |
evolve: deprecate gup and gdown aliases
|
| Wed, 16 Oct 2013 00:37:29 +0200 |
Pierre-Yves David |
amend: use core mechanism for amend
|
| Sat, 13 Oct 2012 16:44:14 +0200 |
Patrick Mezard |
test-stabilize-conflict.t: fix "eight" spelling
stable
|
| Sat, 13 Oct 2012 16:38:23 +0200 |
Patrick Mezard |
test-stabilize-conflict.t: sed -i is still not portable
stable
|
| Sat, 13 Oct 2012 16:31:52 +0200 |
Patrick Mezard |
test-stabilize-conflict.t: yes is not a standard shell utility
stable
|
| Tue, 11 Sep 2012 11:45:00 +0200 |
Pierre-Yves David |
evolve-cmd: fix merge error detection for external tools.
stable
|
