| Sat, 23 Mar 2019 02:10:31 +0530 |
Sushil khanchi |
evolve: add logic to handle a particular case in divergence resolution
|
file |
diff |
annotate
|
| Fri, 22 Mar 2019 00:16:44 +0530 |
Sushil khanchi |
evolve: add a test reflecting wrong behaviour of content-div resolution
|
file |
diff |
annotate
|
| Thu, 07 Mar 2019 10:51:48 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Tue, 05 Mar 2019 21:15:05 +0530 |
Sushil khanchi |
test: include some documentation to describe the case briefly
stable
|
file |
diff |
annotate
|
| Mon, 04 Mar 2019 12:30:15 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Mon, 04 Mar 2019 03:16:51 +0530 |
Sushil khanchi |
evolve: make sure user can recover from conflict (issue6053)
stable
|
file |
diff |
annotate
|
| Mon, 04 Mar 2019 02:55:38 +0530 |
Sushil khanchi |
evolve: add test which shows unrecoverable evolve state (issue6053)
stable
|
file |
diff |
annotate
|
| Fri, 22 Feb 2019 21:01:06 +0530 |
Sushil khanchi |
evolve: fix the broken behaviour on div resolution in relocation case
|
file |
diff |
annotate
|
| Fri, 22 Feb 2019 23:49:37 +0530 |
Sushil khanchi |
evolve: change in a test which demonstrate divergence resolution can break
|
file |
diff |
annotate
|
| Fri, 22 Feb 2019 23:57:18 +0530 |
Sushil khanchi |
tests: update the title of a test as it's not what it says
|
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
|
| 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
|
| Fri, 21 Sep 2018 15:52:53 +0530 |
Sushil khanchi |
evovle: remove redundancy in evolve output
|
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:45:01 +0200 |
Pierre-Yves David |
test-compat: backout change to 1e103c7f7663
mercurial-4.6
|
file |
diff |
annotate
|
| Sat, 21 Jul 2018 02:42:29 +0530 |
Pulkit Goyal |
compat: temporarily move copies fix to compat.py
|
file |
diff |
annotate
|
| Thu, 07 Jun 2018 18:18:30 +0530 |
Pulkit Goyal |
evolve: continue conflicted relocation content-divergence
|
file |
diff |
annotate
|
| Fri, 15 Jun 2018 00:50:17 +0530 |
Pulkit Goyal |
evolve: make one missed error to align other error messages
|
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
|
| Thu, 14 Jun 2018 01:39:33 +0530 |
Pulkit Goyal |
evolve: create resolved cset on successors of current parents
|
file |
diff |
annotate
|