| Sat, 31 Oct 2020 18:06:07 +0800 |
Anton Shestakov |
tests: back out changeset 3b7df91c2ba7
mercurial-5.5
|
| Fri, 25 Sep 2020 09:13:57 -0700 |
Martin von Zweigbergk |
compat: add support for upstream rename of merge.update() to _update()
|
| Fri, 08 May 2020 22:50:09 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Fri, 08 May 2020 22:18:15 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Fri, 08 May 2020 20:36:29 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
| Thu, 07 May 2020 01:29:48 +0200 |
Anton Shestakov |
obslog: makes --origin flag the default
|
| Fri, 08 May 2020 04:02:22 +0200 |
Pierre-Yves David |
evolve: rename `evolve_source_*` to `divergence_source_*`
|
| Thu, 07 May 2020 07:57:14 -0700 |
Martin von Zweigbergk |
evolve: mark new hash-salting extras keys as uninteresting for effect flag
|
| Thu, 30 Apr 2020 10:05:14 -0700 |
Martin von Zweigbergk |
evolve: always create commit when resolving divergence
|
| Fri, 01 May 2020 07:43:15 -0700 |
Martin von Zweigbergk |
tests: add more verification of output to divergence tests
|
| Sat, 29 Feb 2020 15:18:00 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Sat, 29 Feb 2020 15:17:31 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| 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:57 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| 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()
|
| Sat, 23 Nov 2019 16:17:04 +0530 |
Sushil khanchi |
evolve: make sure divergence resolution doesn't undo changes (issue6203)
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
|
| 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
|
| 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:45:16 -0400 |
Matt Harbison |
templatekw: add `instabilities` alias for `troubles`
|
| Wed, 24 Apr 2019 17:21:21 +0800 |
Anton Shestakov |
evolve: use --all by default (BC)
|
| 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, 23 Apr 2019 12:28:32 +0200 |
Pierre-Yves David |
test-compat: adapt test output to 4.4
mercurial-4.4
|
| 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
base
tests/test-divergent.t@1f4c747c83dc
|
| Wed, 10 Apr 2019 17:57:11 +0200 |
Pierre-Yves David |
test: add test for content-divergence with file removal
|
| Wed, 10 Apr 2019 14:32:00 +0200 |
Pierre-Yves David |
test: consolidate the content-divergent test cases
stable
base
tests/test-divergent.t@1f4c747c83dc
|
