| Fri, 22 Jan 2021 04:54:51 +0100 |
Pierre-Yves David |
divergence-resolution: remove explicite hash in some command
|
| Thu, 19 Nov 2020 08:28:45 -0800 |
Martin von Zweigbergk |
tests: update with more detailed exit codes
|
| Thu, 29 Oct 2020 09:19:37 -0700 |
Martin von Zweigbergk |
tests: rebase now produces different "one-line summary" output
|
| Sat, 31 Oct 2020 20:21:12 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Sun, 20 Sep 2020 09:22:04 +0530 |
Sushil khanchi |
evolve: remove swapping nodes logic while resolving divergence
|
| Fri, 08 May 2020 22:50:09 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| 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, 30 Apr 2020 10:05:14 -0700 |
Martin von Zweigbergk |
evolve: always create commit when resolving divergence
|
| Sat, 29 Feb 2020 15:18:00 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Tue, 14 Jan 2020 20:20:13 +0700 |
Anton Shestakov |
obslog: use _successorsetverb() in regular obslog too
|
| Thu, 23 Jan 2020 17:40:59 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| 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
|
| Wed, 24 Apr 2019 16:35:01 +0800 |
Anton Shestakov |
tests: add --no-all to hg evolve to reduce test changes
|
| 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
|
| Wed, 10 Apr 2019 14:32:00 +0200 |
Pierre-Yves David |
test: consolidate the content-divergent test cases
stable
base
tests/test-evolve-abort-contentdiv.t@21c09bcb3aa9
|
