| 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
|
| Wed, 05 Jun 2019 17:42:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Fri, 19 Apr 2019 09:41:39 -0700 |
Martin von Zweigbergk |
evolve: run in a single transaction
|
| Wed, 24 Apr 2019 15:59:02 +0200 |
Anton Shestakov |
evolve: don't update after instability resolution 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
|
| Thu, 11 Apr 2019 22:41:41 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Wed, 10 Apr 2019 21:03:56 +0200 |
Pierre-Yves David |
test: add file cancelation scenario for phase-divergence
|
| Wed, 10 Apr 2019 20:43:42 +0200 |
Pierre-Yves David |
test: introduce a more complete test for phase-divergence
|
| Wed, 10 Apr 2019 20:18:14 +0200 |
Pierre-Yves David |
test: cleanup title and doc phase-divergent cases
|
| Wed, 10 Apr 2019 16:40:58 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Tue, 09 Apr 2019 20:45:36 +0200 |
Pierre-Yves David |
extensions: avoid enabling evolve for unrelated repositories (issue6057)
stable
|
| Thu, 28 Mar 2019 15:05:57 -0700 |
Martin von Zweigbergk |
tests: add obslog output to some tests for divergence resolution
|
| Thu, 28 Mar 2019 14:54:46 -0700 |
Martin von Zweigbergk |
tests: add tests for divergence resolution with split+amend
|
| Tue, 26 Mar 2019 12:53:50 +0100 |
Pierre-Yves David |
test: use 'split' instead of 'splitted' in the tests
|
| Tue, 26 Mar 2019 12:30:10 +0100 |
Pierre-Yves David |
evolve: drop the "computing new diff message" for phase-divergence
|
| Wed, 20 Mar 2019 09:19:02 -0700 |
Martin von Zweigbergk |
evolve: clarify output when phase-divergence resolution results in no change
|
| Tue, 12 Mar 2019 09:44:05 -0700 |
Martin von Zweigbergk |
tests: reduce dependence on previous tests for setup
|
| Tue, 12 Mar 2019 09:48:05 -0700 |
Martin von Zweigbergk |
tests: create "private" repository in already-updated state
|
| 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
|
| Tue, 22 Jan 2019 12:54:43 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Fri, 11 Jan 2019 09:26:41 -0800 |
Martin von Zweigbergk |
fold: sort concatenated commit messages in topological order
|
| Thu, 25 Oct 2018 16:33:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
| Thu, 25 Oct 2018 13:05:14 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
| Thu, 25 Oct 2018 13:03:30 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
