| 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, 04 Dec 2019 21:06:39 +0530 |
Sushil khanchi |
metaedit: use pre-checking before rewriting csets
draft
|
file |
diff |
annotate
|
| Sun, 29 Dec 2019 23:59:41 +0530 |
Sushil khanchi |
evolve: refactor content-divergence resolution logic
draft
|
file |
diff |
annotate
|
| Mon, 25 Nov 2019 02:41:16 +0530 |
Sushil khanchi |
evolve: make necessary changes in a test to reflect a fix in next patch
draft
|
file |
diff |
annotate
|
| Tue, 14 Jan 2020 20:20:13 +0700 |
Anton Shestakov |
obslog: use _successorsetverb() in regular obslog too
|
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
|
| Fri, 13 Dec 2019 01:29:27 +0530 |
Sushil khanchi |
evolve: move a test where it makes more sense
|
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
|
| Tue, 10 Dec 2019 19:58:51 +0100 |
Pierre-Yves David |
test: add test for content divergence involving a date update
stable
|
file |
diff |
annotate
|
| Tue, 10 Dec 2019 19:55:37 +0100 |
Pierre-Yves David |
test: add test for content divergence involving a date update
stable
|
file |
diff |
annotate
|
| Tue, 10 Dec 2019 19:27:55 +0100 |
Pierre-Yves David |
test: add test for content divergence involving a date update
stable
|
file |
diff |
annotate
|
| Tue, 10 Dec 2019 19:13:06 +0100 |
Pierre-Yves David |
test: highlight data handling when solving divergence
stable
|
file |
diff |
annotate
|
| Mon, 09 Sep 2019 09:28:47 +0700 |
Anton Shestakov |
evolve: check that relocating makes sense in _solvedivergent() (issue5958)
stable
|
file |
diff |
annotate
|
| Wed, 24 Oct 2018 19:32:04 +0200 |
Pierre-Yves David |
tests: demonstrate content divergence causing "relocate node on top of itself"
stable
|
file |
diff |
annotate
|