| 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 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
|
| 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
|
| Sun, 10 Nov 2019 16:32:34 +0530 |
Sushil khanchi |
evolve: add pre-check logic for creation of phase divergence locally
draft
|
file |
diff |
annotate
|
| Sun, 10 Nov 2019 16:32:34 +0530 |
Sushil khanchi |
evolve: add pre-check logic for creation of phase divergence locally
draft
|
file |
diff |
annotate
|
| Sun, 10 Nov 2019 18:08:57 +0530 |
Sushil khanchi |
evolve: add test to show that user can create phase-divergence locally
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
|
| Tue, 14 Jan 2020 20:20:13 +0700 |
Anton Shestakov |
obslog: use _successorsetverb() in regular obslog too
|
file |
diff |
annotate
|
| Fri, 27 Sep 2019 13:03:20 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
| Fri, 27 Sep 2019 13:03:18 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
file |
diff |
annotate
|
| Fri, 30 Aug 2019 11:31:19 +0700 |
Anton Shestakov |
obslog: only indent the first chunk and chunks just after newlines (issue6175)
stable
|
file |
diff |
annotate
|
| Fri, 30 Aug 2019 11:28:02 +0700 |
Anton Shestakov |
tests: demonstrate too many spaces in olog -p output with word-diff
stable
|
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
|
| 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
|
| Fri, 19 Apr 2019 09:41:39 -0700 |
Martin von Zweigbergk |
evolve: run in a single transaction
|
file |
diff |
annotate
|
| Wed, 24 Apr 2019 15:59:02 +0200 |
Anton Shestakov |
evolve: don't update after instability resolution by default (BC)
|
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
|
| Tue, 23 Apr 2019 12:28:32 +0200 |
Pierre-Yves David |
test-compat: adapt test output to 4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 22:44:53 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 22:42:13 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 22:41:41 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
file |
diff |
annotate
|
| Wed, 10 Apr 2019 21:03:56 +0200 |
Pierre-Yves David |
test: add file cancelation scenario for phase-divergence
|
file |
diff |
annotate
|
| Wed, 10 Apr 2019 20:43:42 +0200 |
Pierre-Yves David |
test: introduce a more complete test for phase-divergence
|
file |
diff |
annotate
|
| Wed, 10 Apr 2019 20:18:14 +0200 |
Pierre-Yves David |
test: cleanup title and doc phase-divergent cases
|
file |
diff |
annotate
|
| Wed, 10 Apr 2019 16:40:58 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Tue, 09 Apr 2019 20:45:36 +0200 |
Pierre-Yves David |
extensions: avoid enabling evolve for unrelated repositories (issue6057)
stable
|
file |
diff |
annotate
|
| Thu, 28 Mar 2019 15:05:57 -0700 |
Martin von Zweigbergk |
tests: add obslog output to some tests for divergence resolution
|
file |
diff |
annotate
|
| Thu, 28 Mar 2019 14:54:46 -0700 |
Martin von Zweigbergk |
tests: add tests for divergence resolution with split+amend
|
file |
diff |
annotate
|
| Tue, 26 Mar 2019 12:53:50 +0100 |
Pierre-Yves David |
test: use 'split' instead of 'splitted' in the tests
|
file |
diff |
annotate
|
| Tue, 26 Mar 2019 12:30:10 +0100 |
Pierre-Yves David |
evolve: drop the "computing new diff message" for phase-divergence
|
file |
diff |
annotate
|
| Wed, 20 Mar 2019 09:19:02 -0700 |
Martin von Zweigbergk |
evolve: clarify output when phase-divergence resolution results in no change
|
file |
diff |
annotate
|
| Tue, 12 Mar 2019 09:44:05 -0700 |
Martin von Zweigbergk |
tests: reduce dependence on previous tests for setup
|
file |
diff |
annotate
|
| Tue, 12 Mar 2019 09:48:05 -0700 |
Martin von Zweigbergk |
tests: create "private" repository in already-updated state
|
file |
diff |
annotate
|
| Tue, 22 Jan 2019 12:57:25 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Tue, 22 Jan 2019 12:54:44 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
| Tue, 22 Jan 2019 12:54:43 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
file |
diff |
annotate
|
| Fri, 11 Jan 2019 09:26:41 -0800 |
Martin von Zweigbergk |
fold: sort concatenated commit messages in topological order
|
file |
diff |
annotate
|
| Thu, 25 Oct 2018 16:33:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Thu, 25 Oct 2018 13:05:14 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Thu, 25 Oct 2018 13:03:30 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
| Thu, 25 Oct 2018 13:24:34 +0200 |
Pierre-Yves David |
branching: revert test outptu change for 4.7
mercurial-4.7
|
file |
diff |
annotate
|
| Wed, 17 Oct 2018 13:44:06 +0200 |
Pierre-Yves David |
branching: preserve the expected output on default
|
file |
diff |
annotate
|
| Fri, 12 Oct 2018 15:20:54 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Fri, 12 Oct 2018 15:15:09 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Fri, 12 Oct 2018 15:15:05 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
file |
diff |
annotate
|
| Fri, 12 Oct 2018 14:55:46 +0200 |
Pierre-Yves David |
test: backed out test output changes from changeset ef22eef37ecc
stable
|
file |
diff |
annotate
|
| Wed, 12 Sep 2018 11:53:41 +0200 |
Pierre-Yves David |
test: update output to match new "pull" phase report
|
file |
diff |
annotate
|
| Fri, 03 Aug 2018 00:22:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Thu, 02 Aug 2018 02:47:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Tue, 31 Jul 2018 11:47:20 +0200 |
Pierre-Yves David |
test-compat: backed out changeset 41fc764bf28c
mercurial-4.6
|
file |
diff |
annotate
|
| Tue, 31 Jul 2018 11:46:30 +0200 |
Pierre-Yves David |
test-compat: backed out changeset dda5b2134b32
mercurial-4.6
|
file |
diff |
annotate
|
| Fri, 15 Jun 2018 00:16:29 +0530 |
Pulkit Goyal |
evolve: raise error.InterventionRequired instead of Abort when conflicts
|
file |
diff |
annotate
|
| Tue, 12 Jun 2018 19:00:12 +0530 |
Pulkit Goyal |
evolve: improve error messages when conflicts occur
|
file |
diff |
annotate
|