| Fri, 08 May 2020 04:02:22 +0200 |
Pierre-Yves David |
evolve: rename `evolve_source_*` to `divergence_source_*`
|
file |
diff |
annotate
|
| Thu, 30 Apr 2020 10:05:14 -0700 |
Martin von Zweigbergk |
evolve: always create commit when resolving divergence
|
file |
diff |
annotate
|
| Fri, 01 May 2020 07:44:01 -0700 |
Martin von Zweigbergk |
tests: avoid referring to commits by hash in a few places
|
file |
diff |
annotate
|
| Sat, 29 Feb 2020 15:18:00 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
| Fri, 28 Feb 2020 23:18:48 +0700 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
file |
diff |
annotate
|
| Thu, 23 Jan 2020 17:40:59 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
| Thu, 23 Jan 2020 17:40:52 +0700 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
file |
diff |
annotate
|
| Mon, 04 Nov 2019 01:30:50 +0530 |
Sushil khanchi |
evolve: add pre-check logic for content-divergence in rewriteutil.precheck()
|
file |
diff |
annotate
|
| Fri, 11 Oct 2019 21:32:27 +0200 |
Manuel Jacob |
evolve: preserve date when resolving content-divergence (issue6202)
stable
|
file |
diff |
annotate
|
| Mon, 29 Jul 2019 14:43:17 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
| Mon, 29 Jul 2019 13:19:48 +0200 |
Pierre-Yves David |
test-compat: reverte output change from f802a75da585 (hg-5.1)
mercurial-5.0
|
file |
diff |
annotate
|
| Tue, 09 Jul 2019 21:49:37 -0700 |
Martin von Zweigbergk |
tests: update output for shorted prompts from Mercurial
|
file |
diff |
annotate
|
| Wed, 05 Jun 2019 17:56:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Wed, 05 Jun 2019 17:45:45 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
| Fri, 26 Apr 2019 01:20:08 +0530 |
Sushil khanchi |
evolve: move status msg to verbose mode in content-divergence resolution
|
file |
diff |
annotate
|
| Sat, 27 Apr 2019 22:59:48 -0400 |
Matt Harbison |
revset: switch internal uses and tests to `predecessors` from legacy name
|
file |
diff |
annotate
|
| Wed, 24 Apr 2019 15:59:02 +0200 |
Anton Shestakov |
evolve: don't update after instability resolution by default (BC)
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 22:44:53 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 22:42:13 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
| Sun, 10 Mar 2019 18:50:00 +0800 |
Anton Shestakov |
stack: make @ (current) more important than $ (some sort of unstable)
|
file |
diff |
annotate
|
| Sat, 09 Mar 2019 13:13:53 +0800 |
Anton Shestakov |
stack: show content and phase divergent state and symbol
|
file |
diff |
annotate
|
| Thu, 07 Mar 2019 19:13:45 +0800 |
Anton Shestakov |
stack: rename unstable -> orphan
|
file |
diff |
annotate
|
| Tue, 22 Jan 2019 12:57:25 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Tue, 22 Jan 2019 12:54:44 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
| Wed, 12 Dec 2018 17:22:58 +0100 |
Pierre-Yves David |
split: rework the prompt to be more standard
|
file |
diff |
annotate
|
| Tue, 20 Feb 2018 09:35:16 +0100 |
Pierre-Yves David |
split: add a option to discard remaining change during split
|
file |
diff |
annotate
|
| Tue, 20 Feb 2018 09:35:16 +0100 |
Pierre-Yves David |
split: add a way to abort a split from the prompt
|
file |
diff |
annotate
|
| Tue, 20 Feb 2018 09:36:55 +0100 |
Pierre-Yves David |
split: add a help entry to the final prompt
|
file |
diff |
annotate
|
| Thu, 25 Oct 2018 18:32:54 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Thu, 25 Oct 2018 18:32:52 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Thu, 25 Oct 2018 18:32:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
| Thu, 25 Oct 2018 18:09:08 +0200 |
Pierre-Yves David |
evolve: do not try to display stack index of changeset who do not have one
stable
|
file |
diff |
annotate
|
| Thu, 25 Oct 2018 16:33:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Thu, 25 Oct 2018 13:05:14 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Thu, 25 Oct 2018 13:03:30 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
| Wed, 17 Oct 2018 14:47:38 +0200 |
Pierre-Yves David |
topicidx: stop assigning index number to obsolete changesets
stable
|
file |
diff |
annotate
|
| Thu, 25 Oct 2018 11:32:43 +0200 |
Pierre-Yves David |
stack-index: add some test featuring content diversion
stable
|
file |
diff |
annotate
|
| Fri, 12 Oct 2018 15:20:54 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Fri, 12 Oct 2018 15:15:09 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Fri, 12 Oct 2018 14:40:03 +0200 |
Pierre-Yves David |
prev: also use stack shortcut in output when possible
|
file |
diff |
annotate
|
| Mon, 03 Sep 2018 22:09:26 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Mon, 03 Sep 2018 22:06:12 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Mon, 03 Sep 2018 17:07:36 +0200 |
Pierre-Yves David |
stack: display 's#' instead of 't#' and 'b#'
|
file |
diff |
annotate
|
| Wed, 21 Mar 2018 16:35:18 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
file |
diff |
annotate
|
| Wed, 21 Mar 2018 16:32:54 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.3 into mercurial-4.2
mercurial-4.2
|
file |
diff |
annotate
|
| Wed, 21 Mar 2018 16:18:31 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Wed, 21 Mar 2018 16:06:17 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Sat, 13 Jan 2018 14:35:49 -0800 |
Martin von Zweigbergk |
evolve: update output for wider reporting of troubled changesets
|
file |
diff |
annotate
|
| Tue, 16 Jan 2018 04:32:43 +0100 |
Pierre-Yves David |
branching: merge stable back into default
|
file |
diff |
annotate
|
| Tue, 16 Jan 2018 04:41:48 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
file |
diff |
annotate
|
| Tue, 16 Jan 2018 04:38:04 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.3 into mercurial-4.2
mercurial-4.2
|
file |
diff |
annotate
|
| Tue, 16 Jan 2018 04:35:34 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Mon, 15 Jan 2018 19:52:00 +0100 |
Pierre-Yves David |
branching: backed out test output changes from core-1905aac253f0
stable
|
file |
diff |
annotate
|
| Fri, 05 Jan 2018 09:23:09 +0100 |
Boris Feld |
test: update output to 9b3f95d9783d
|
file |
diff |
annotate
|
| Mon, 11 Dec 2017 18:30:15 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
file |
diff |
annotate
|
| Mon, 11 Dec 2017 18:30:14 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.3 into mercurial-4.2
mercurial-4.2
|
file |
diff |
annotate
|
| Mon, 11 Dec 2017 16:32:03 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Mon, 11 Dec 2017 23:47:25 +0530 |
Pulkit Goyal |
topics: fix `hg stack` in case of split
stable
|
file |
diff |
annotate
|
| Mon, 11 Dec 2017 23:33:50 +0530 |
Pulkit Goyal |
tests: add a test showing traceback on `hg stack` in case of split
stable
|
file |
diff |
annotate
|