| Mon, 03 Sep 2018 23:21:39 +0200 |
Pierre-Yves David |
branching: merge back with stable
|
| Mon, 03 Sep 2018 17:20:28 +0200 |
Pierre-Yves David |
test-output: backout test output update in 503ae2689df8
stable
|
| Wed, 29 Aug 2018 18:59:07 +0200 |
Pierre-Yves David |
test: update output after merge message change
|
| Fri, 08 Jun 2018 22:52:53 +0530 |
Pulkit Goyal |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
| Fri, 08 Jun 2018 22:52:52 +0530 |
Pulkit Goyal |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
| Fri, 08 Jun 2018 17:36:28 +0530 |
Pulkit Goyal |
next-prev: always respect the --merge flag
stable
|
| Fri, 08 Jun 2018 18:32:48 +0530 |
Pulkit Goyal |
next-prev: add tests showing --merge not respected in some cases
stable
|
| Sun, 03 Jun 2018 03:21:25 +0530 |
Pulkit Goyal |
next-prev: replace the error hint to mention about `--merge` flag
stable
|
| Sun, 03 Jun 2018 03:13:47 +0530 |
Pulkit Goyal |
tests: add tests for conflicts while respecting commands.update.check
stable
|
| Sun, 03 Jun 2018 02:37:13 +0530 |
Pulkit Goyal |
next: respect `commands.update.check` config option in `hg next` (issue5808)
stable
|
| Sun, 03 Jun 2018 02:36:24 +0530 |
Pulkit Goyal |
prev: respect `commands.update.check` config option in `hg prev` (issue5808)
stable
|
| Sun, 03 Jun 2018 02:50:55 +0530 |
Pulkit Goyal |
tests: add test demonstrating issue5808
stable
|
| Sun, 03 Jun 2018 02:26:19 +0530 |
Pulkit Goyal |
next: bail out early in `hg next --evolve` if dirty wdir
stable
|
| Sun, 03 Jun 2018 02:24:28 +0530 |
Pulkit Goyal |
tests: add test of `hg next --evolve` with dirty working directory
stable
|
| Wed, 21 Mar 2018 16:35:18 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
| 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
|
| Fri, 16 Mar 2018 13:24:57 +0530 |
Pulkit Goyal |
prev: show changeset hash in --dry-run instead of rev numbers
|
| Fri, 16 Mar 2018 13:13:21 +0530 |
Pulkit Goyal |
prev: prompt user to choose parent in case of multiple parents
|
| Fri, 16 Mar 2018 12:14:39 +0530 |
Pulkit Goyal |
next: prompt user to choose child in ambiguity in `hg next --evolve`
|
| Fri, 16 Mar 2018 11:46:47 +0530 |
Pulkit Goyal |
next: prompt user to choose a children in case of ambiguity
|
| Fri, 16 Mar 2018 11:31:13 +0530 |
Pulkit Goyal |
next: show changeset hash in `--dry-run` instead of rev numbers
|
| Wed, 17 May 2017 09:39:15 +0200 |
Boris Feld |
color: add some colors to evolve command itself
|
| Tue, 06 Feb 2018 13:00:28 +0100 |
Pierre-Yves David |
merge with stable
|
| Sun, 21 Jan 2018 16:55:02 -0500 |
Matt Harbison |
test: explicitly run HGEDITOR shell command with `sh`
stable
|
| Sat, 27 Jan 2018 16:13:19 +0530 |
Pulkit Goyal |
evolve: make the _solve* functions return a tuple
|
| Mon, 11 Dec 2017 18:30:15 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
| Mon, 11 Dec 2017 16:32:03 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.3
mercurial-4.3
|
| Mon, 11 Dec 2017 09:33:32 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
| Mon, 11 Dec 2017 09:33:04 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.3
mercurial-4.3
|
| Tue, 05 Dec 2017 18:31:08 +0100 |
Pierre-Yves David |
branching: merge with stable
|
| Mon, 04 Dec 2017 14:27:27 -0800 |
Kyle Lippincott |
typos: fix typos in several locations
stable
|
| Mon, 04 Dec 2017 14:27:27 -0800 |
Kyle Lippincott |
typos: fix typos in several locations
|
| Thu, 16 Nov 2017 11:22:38 -0800 |
Martin von Zweigbergk |
evolve: make prev/next respect --quiet flag (issue5742)
|
| Fri, 20 Oct 2017 18:44:52 +0200 |
Pierre-Yves David |
test-compat: merge with mercurial-4.0 branch
mercurial-3.9
|
| Fri, 20 Oct 2017 18:41:05 +0200 |
Pierre-Yves David |
test-compat: merge with mercurial-4.2 branch
mercurial-4.1
|
| Fri, 20 Oct 2017 20:04:13 +0200 |
Pierre-Yves David |
test-compat: revert output changes from phase renaming
mercurial-4.3
|
| Wed, 27 Sep 2017 16:26:30 +0200 |
Pierre-Yves David |
packaging: merge stable back into default
|
| Wed, 27 Sep 2017 01:22:58 +0200 |
Pierre-Yves David |
compat-test: merge future 6.7.0 into 3.9 compat branch
mercurial-3.9
|
| Wed, 27 Sep 2017 01:12:47 +0200 |
Pierre-Yves David |
compat-test: merge future 6.7.0 into 4.1 compat branch
mercurial-4.1
|
| Wed, 27 Sep 2017 00:54:28 +0200 |
Pierre-Yves David |
branching: merge future 6.7.0 in the stable branch
stable
|
| Thu, 24 Aug 2017 09:11:06 +0200 |
Boris Feld |
warning: rename unstable warning message
|
| Tue, 25 Jul 2017 04:01:10 +0200 |
Pierre-Yves David |
test-compat: merge with mercurial-4.0
mercurial-3.9
|
| Tue, 25 Jul 2017 03:59:22 +0200 |
Pierre-Yves David |
test-compat: merge with mercurial-4.2
mercurial-4.1
|
| Mon, 24 Jul 2017 04:41:31 +0200 |
Pierre-Yves David |
test: remove reference to the graphlog extension
|
| Fri, 14 Jul 2017 01:32:34 +0200 |
Pierre-Yves David |
prev: issue a proper error when reaching repository root
|
| Fri, 14 Jul 2017 01:21:32 +0200 |
Pierre-Yves David |
prev: stop creating a repository at the root of 'test-repo.t'
|
| Mon, 22 May 2017 15:42:13 +0200 |
Pierre-Yves David |
test-compat: merge with mercurial-4.0 branch
mercurial-3.9
|
| Mon, 22 May 2017 15:28:36 +0200 |
Pierre-Yves David |
test-compat: merge with stable
mercurial-4.1
|
| Fri, 19 May 2017 17:34:45 +0200 |
Pierre-Yves David |
next: prevent a color related crash when evolve
stable
|
| Thu, 18 May 2017 23:51:10 +0200 |
Pierre-Yves David |
merge with future 6.2.0
mercurial-3.9
|
| Thu, 18 May 2017 23:12:52 +0200 |
Pierre-Yves David |
merge with future 6.2.0
mercurial-4.1
|
| Thu, 18 May 2017 22:53:01 +0200 |
Pierre-Yves David |
test: enforce color to be enabled
mercurial-4.1
|
| Wed, 17 May 2017 09:28:10 +0200 |
Boris Feld |
color: update the shorttemplate to use colors
|
| Tue, 14 Mar 2017 14:47:20 -0700 |
Pierre-Yves David |
mercurial-3.9: merge with hg-4.0 branch
mercurial-3.9
|
| Tue, 28 Feb 2017 15:09:03 +0100 |
Pierre-Yves David |
evolve: move the extensions to 'hgext3rd'
|
| Sat, 29 Oct 2016 14:40:47 +0200 |
Pierre-Yves David |
merge with latest fix
mercurial-3.9
|
| Fri, 28 Oct 2016 17:15:57 -0700 |
Martin von Zweigbergk |
evolve: use single quotes in usage messages
stable
|
| Fri, 28 Oct 2016 16:03:00 +0200 |
Pierre-Yves David |
integrate code update and test change from future 5.5 code
mercurial-3.9
|
| Sun, 16 Oct 2016 20:29:27 +0200 |
Pierre-Yves David |
merge with stable
|
