| Sat, 13 Mar 2021 03:17:00 +0100 |
Pierre-Yves David |
copies: distinguish between merged and touched files during upgrade
|
file |
diff |
annotate
|
| Mon, 15 Mar 2021 13:37:45 +0100 |
Pierre-Yves David |
copies: detect files as `touched/salvaged` if they only existed on one side
|
file |
diff |
annotate
|
| Tue, 02 Mar 2021 02:00:29 +0100 |
Pierre-Yves David |
test-copies: add a test updating file content while salvaging it
|
file |
diff |
annotate
|
| Sat, 13 Mar 2021 04:54:05 +0100 |
Pierre-Yves David |
test-copies: show some wrong ChangedFiles upgrade
|
file |
diff |
annotate
|
| Wed, 10 Mar 2021 13:14:32 +0530 |
Pulkit Goyal |
commit: get info from mergestate whether a file was merged or not
|
file |
diff |
annotate
|
| Tue, 02 Mar 2021 00:05:22 +0100 |
Pierre-Yves David |
test-copies: add a test updating file content while merging a pure overwrite
|
file |
diff |
annotate
|
| Thu, 04 Mar 2021 09:55:06 +0100 |
Raphaël Gomès |
format: remove sidedata format variant
|
file |
diff |
annotate
|
| Wed, 20 Jan 2021 21:14:06 +0100 |
Raphaël Gomès |
revlogv2: allow upgrading to v2
|
file |
diff |
annotate
|
| Mon, 01 Mar 2021 20:08:26 +0100 |
Pierre-Yves David |
copies: tests and fix parallel computation of changed file information
|
file |
diff |
annotate
|
| Wed, 24 Feb 2021 09:27:33 -0800 |
Martin von Zweigbergk |
tests: correct a commit description in test-copies-chain-merge.t
|
file |
diff |
annotate
|
| Sat, 12 Dec 2020 19:35:08 +0100 |
Pierre-Yves David |
copies: detect case when a merge decision overwrite previous data
|
file |
diff |
annotate
|
| Mon, 22 Feb 2021 12:21:00 +0100 |
Pierre-Yves David |
test-copies: introduce merge chains test for the P/Q merges
|
file |
diff |
annotate
|
| Mon, 22 Feb 2021 11:56:58 +0100 |
Pierre-Yves David |
test-copies: add a case involving the `b` and a new `r` branch
|
file |
diff |
annotate
|
| Fri, 19 Feb 2021 20:46:33 +0100 |
Pierre-Yves David |
test-copies: introduce case combining the `p` and `q` branch
|
file |
diff |
annotate
|
| Fri, 19 Feb 2021 20:47:15 +0100 |
Pierre-Yves David |
test-copies: add a `q` branch similar to the `e` but on the new files
|
file |
diff |
annotate
|
| Fri, 19 Feb 2021 20:47:07 +0100 |
Pierre-Yves David |
test-copies: add a `p` branch similar to the `a` but on the new files
|
file |
diff |
annotate
|
| Fri, 19 Feb 2021 18:57:09 +0100 |
Pierre-Yves David |
test-copies: move the new files in the `i` branch
|
file |
diff |
annotate
|
| Fri, 19 Feb 2021 17:06:12 +0100 |
Pierre-Yves David |
test-copies: add 3 new files with their own content
|
file |
diff |
annotate
|
| Fri, 19 Feb 2021 16:37:55 +0100 |
Pierre-Yves David |
test-copies: introduce merge chaing test for the A/E + change tests
|
file |
diff |
annotate
|
| Mon, 22 Feb 2021 19:39:33 +0100 |
Pierre-Yves David |
test-copies: add a "change during merge" variant to the A+E test
|
file |
diff |
annotate
|
| Fri, 19 Feb 2021 22:56:46 +0100 |
Pierre-Yves David |
test-copies: filter out the linkrev part of `debugindex`
|
file |
diff |
annotate
|
| Fri, 19 Feb 2021 22:27:25 +0100 |
Pierre-Yves David |
test-copies: use "case-id" instead of revision number when listing sidedata
|
file |
diff |
annotate
|
| Wed, 17 Feb 2021 21:08:45 +0100 |
Pierre-Yves David |
test-copies: remove revision number from log
|
file |
diff |
annotate
|
| Mon, 14 Dec 2020 17:56:56 +0100 |
Pierre-Yves David |
test-copies: add test chaining multiple merge
|
file |
diff |
annotate
|
| Mon, 14 Dec 2020 17:56:30 +0100 |
Pierre-Yves David |
test-copies: add test chaining multiple merges
|
file |
diff |
annotate
|
| Tue, 16 Feb 2021 15:43:54 +0100 |
Pierre-Yves David |
test-copies: add test chaining multiple merges
|
file |
diff |
annotate
|
| Thu, 18 Feb 2021 13:49:55 +0100 |
Pierre-Yves David |
test-copies: add subcase titles for various "conflicting" information variant
|
file |
diff |
annotate
|
| Thu, 18 Feb 2021 12:45:16 +0100 |
Pierre-Yves David |
test-copies: improve description of the B+F case
|
file |
diff |
annotate
|
| Tue, 16 Feb 2021 06:02:09 +0100 |
Pierre-Yves David |
test-copies: improve description of the C+H case
|
file |
diff |
annotate
|
| Tue, 16 Feb 2021 05:58:22 +0100 |
Pierre-Yves David |
test-copies: improve description of the B+C "revert/restore" case
|
file |
diff |
annotate
|