Fri, 08 May 2020 04:02:22 +0200 |
Pierre-Yves David |
evolve: rename `evolve_source_*` to `divergence_source_*`
|
Thu, 30 Apr 2020 10:05:14 -0700 |
Martin von Zweigbergk |
evolve: always create commit when resolving divergence
|
Fri, 01 May 2020 07:44:01 -0700 |
Martin von Zweigbergk |
tests: avoid referring to commits by hash in a few places
|
Sat, 29 Feb 2020 15:18:00 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
Fri, 28 Feb 2020 23:18:48 +0700 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
Thu, 23 Jan 2020 17:40:59 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
Thu, 23 Jan 2020 17:40:52 +0700 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
Mon, 04 Nov 2019 01:30:50 +0530 |
Sushil khanchi |
evolve: add pre-check logic for content-divergence in rewriteutil.precheck()
|
Fri, 11 Oct 2019 21:32:27 +0200 |
Manuel Jacob |
evolve: preserve date when resolving content-divergence (issue6202)
stable
|
Mon, 29 Jul 2019 14:43:17 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
Mon, 29 Jul 2019 13:19:48 +0200 |
Pierre-Yves David |
test-compat: reverte output change from f802a75da585 (hg-5.1)
mercurial-5.0
|
Tue, 09 Jul 2019 21:49:37 -0700 |
Martin von Zweigbergk |
tests: update output for shorted prompts from Mercurial
|
Wed, 05 Jun 2019 17:56:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
Wed, 05 Jun 2019 17:45:45 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
Fri, 26 Apr 2019 01:20:08 +0530 |
Sushil khanchi |
evolve: move status msg to verbose mode in content-divergence resolution
|
Sat, 27 Apr 2019 22:59:48 -0400 |
Matt Harbison |
revset: switch internal uses and tests to `predecessors` from legacy name
|
Wed, 24 Apr 2019 15:59:02 +0200 |
Anton Shestakov |
evolve: don't update after instability resolution by default (BC)
|
Thu, 11 Apr 2019 22:44:53 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
Thu, 11 Apr 2019 22:42:13 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
Sun, 10 Mar 2019 18:50:00 +0800 |
Anton Shestakov |
stack: make @ (current) more important than $ (some sort of unstable)
|
Sat, 09 Mar 2019 13:13:53 +0800 |
Anton Shestakov |
stack: show content and phase divergent state and symbol
|
Thu, 07 Mar 2019 19:13:45 +0800 |
Anton Shestakov |
stack: rename unstable -> orphan
|
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, 22 Jan 2019 12:54:44 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
Wed, 12 Dec 2018 17:22:58 +0100 |
Pierre-Yves David |
split: rework the prompt to be more standard
|
Tue, 20 Feb 2018 09:35:16 +0100 |
Pierre-Yves David |
split: add a option to discard remaining change during split
|
Tue, 20 Feb 2018 09:35:16 +0100 |
Pierre-Yves David |
split: add a way to abort a split from the prompt
|
Tue, 20 Feb 2018 09:36:55 +0100 |
Pierre-Yves David |
split: add a help entry to the final prompt
|
Thu, 25 Oct 2018 18:32:54 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
Thu, 25 Oct 2018 18:32:52 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|