| Fri, 08 May 2020 22:50:09 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
draft mercurial-4.6 tip
|
file |
diff |
annotate
|
| Fri, 08 May 2020 22:18:15 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
draft mercurial-4.7
|
file |
diff |
annotate
|
| Fri, 08 May 2020 20:36:29 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
draft mercurial-5.0
|
file |
diff |
annotate
|
| Fri, 08 May 2020 19:22:36 +0800 |
Anton Shestakov |
test-compat: back out changeset 4da1d21231ae
draft mercurial-5.3
|
file |
diff |
annotate
|
| Thu, 07 May 2020 01:29:48 +0200 |
Anton Shestakov |
obslog: makes --origin flag the default
|
file |
diff |
annotate
|
| 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
|
| Mon, 16 Dec 2019 11:14:39 -0800 |
Martin von Zweigbergk |
tests: add debugobsolete calls before many obslog calls
|
file |
diff |
annotate
|
| Wed, 15 Apr 2020 21:52:29 +0800 |
Anton Shestakov |
tests: update output to match 1b8fd4af3318 in core
|
file |
diff |
annotate
|
| Mon, 30 Dec 2019 00:43:17 +0530 |
Sushil khanchi |
test: no need to look at full log
draft
|
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
|
| Sat, 29 Feb 2020 15:17:31 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
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
|
| Tue, 14 Jan 2020 20:20:13 +0700 |
Anton Shestakov |
obslog: use _successorsetverb() in regular obslog too
|
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
|
| 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 14:43:15 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
file |
diff |
annotate
|
| Mon, 29 Jul 2019 13:19:54 +0200 |
Pierre-Yves David |
test-compat: reverte output change from 4764e8436b2a (hg-5.1)
mercurial-5.0
|
file |
diff |
annotate
|
| Thu, 11 Jul 2019 10:07:39 +0200 |
Pierre-Yves David |
tests: update output for shorted prompts from Mercurial
|
file |
diff |
annotate
|
| Thu, 06 Jun 2019 17:37:42 +0800 |
Anton Shestakov |
evolvecmd: the proper way to deal with conflicts is to resolve them
|
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
|
| Wed, 05 Jun 2019 17:42:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
file |
diff |
annotate
|
| Tue, 04 Jun 2019 11:08:44 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
| base
|
| 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:45:16 -0400 |
Matt Harbison |
templatekw: add `instabilities` alias for `troubles`
|
file |
diff |
annotate
|
| Fri, 19 Apr 2019 09:41:39 -0700 |
Martin von Zweigbergk |
evolve: run in a single transaction
|
file |
diff |
annotate
|
| Wed, 17 Apr 2019 21:16:17 +0530 |
Sushil khanchi |
evolve: show a status message when merging leads to public cset
|
file |
diff |
annotate
|
| Sun, 14 Apr 2019 02:18:19 +0800 |
Anton Shestakov |
tests: add --update to hg evolve to reduce test changes for the next patch
|
file |
diff |
annotate
|
| Wed, 17 Apr 2019 00:20:44 +0530 |
Sushil khanchi |
tests: consolidate the public-content-divergent test cases
|
file |
diff |
annotate
| base
|