| Tue, 15 Dec 2020 18:22:57 +0100 |
Pierre-Yves David |
copies-rust: remove the ancestor Oracle logic
|
| Tue, 15 Dec 2020 18:04:23 +0100 |
Pierre-Yves David |
copies-rust: track "overwrites" directly within CopySource
|
| Wed, 23 Dec 2020 03:04:43 +0100 |
Pierre-Yves David |
copies-rust: add methods to build and update CopySource
|
| Wed, 23 Dec 2020 03:04:33 +0100 |
Pierre-Yves David |
copies-rust: fix reverted argument when merging tiny minor or major
|
| Mon, 21 Dec 2020 08:42:30 +0100 |
Pierre-Yves David |
copies-rust: rename TimeStampedPathCopy to CopySource
|
| Tue, 15 Dec 2020 17:26:00 +0100 |
Pierre-Yves David |
copies-rust: rename TimeStampedPathCopies to InternalPathCopies
|
| Sat, 12 Dec 2020 19:35:08 +0100 |
Pierre-Yves David |
copies: detect case when a merge decision overwrite previous data
|
| Mon, 14 Dec 2020 19:26:33 +0100 |
Pierre-Yves David |
copies: rearrange all value comparison conditional
|
| Mon, 22 Feb 2021 12:21:00 +0100 |
Pierre-Yves David |
test-copies: introduce merge chains test for the P/Q merges
|
| Mon, 22 Feb 2021 11:56:58 +0100 |
Pierre-Yves David |
test-copies: add a case involving the `b` and a new `r` branch
|
| Fri, 19 Feb 2021 20:46:33 +0100 |
Pierre-Yves David |
test-copies: introduce case combining the `p` and `q` branch
|
| 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
|
| 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
|
| Fri, 19 Feb 2021 18:57:09 +0100 |
Pierre-Yves David |
test-copies: move the new files in the `i` branch
|
| Fri, 19 Feb 2021 17:06:12 +0100 |
Pierre-Yves David |
test-copies: add 3 new files with their own content
|
| Fri, 19 Feb 2021 16:37:55 +0100 |
Pierre-Yves David |
test-copies: introduce merge chaing test for the A/E + change tests
|
| Mon, 22 Feb 2021 19:39:33 +0100 |
Pierre-Yves David |
test-copies: add a "change during merge" variant to the A+E test
|
| Fri, 19 Feb 2021 22:56:46 +0100 |
Pierre-Yves David |
test-copies: filter out the linkrev part of `debugindex`
|
| Fri, 19 Feb 2021 22:27:25 +0100 |
Pierre-Yves David |
test-copies: use "case-id" instead of revision number when listing sidedata
|
| Fri, 26 Feb 2021 15:34:22 +0530 |
Sushil khanchi |
patch: fix a formatting issue
stable
|
| Tue, 02 Feb 2021 20:20:17 +0900 |
Yuya Nishihara |
log: fix handling of root (or empty) path provided by matcher (issue6478)
stable
|
| Thu, 25 Feb 2021 15:18:00 +0530 |
Sushil khanchi |
tests: accept output changes by 33350debb480
stable
|
| Wed, 17 Feb 2021 21:08:45 +0100 |
Pierre-Yves David |
test-copies: remove revision number from log
|
| Mon, 14 Dec 2020 17:56:56 +0100 |
Pierre-Yves David |
test-copies: add test chaining multiple merge
|
| Mon, 14 Dec 2020 17:56:30 +0100 |
Pierre-Yves David |
test-copies: add test chaining multiple merges
|
| Tue, 16 Feb 2021 15:43:54 +0100 |
Pierre-Yves David |
test-copies: add test chaining multiple merges
|
| Thu, 18 Feb 2021 13:49:55 +0100 |
Pierre-Yves David |
test-copies: add subcase titles for various "conflicting" information variant
|
| Thu, 18 Feb 2021 12:45:16 +0100 |
Pierre-Yves David |
test-copies: improve description of the B+F case
|
