| 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
|
| Tue, 16 Feb 2021 05:54:55 +0100 |
Pierre-Yves David |
test-copies: improve description of the G+C case
|
file |
diff |
annotate
|
| Tue, 16 Feb 2021 05:46:32 +0100 |
Pierre-Yves David |
test-copies: improve description of the G+F case
|
file |
diff |
annotate
|
| Tue, 16 Feb 2021 05:39:22 +0100 |
Pierre-Yves David |
test-copies: improve description of the D+G case
|
file |
diff |
annotate
|
| Tue, 16 Feb 2021 05:35:18 +0100 |
Pierre-Yves David |
test-copies: improve description of the A+E case
|
file |
diff |
annotate
|
| Tue, 16 Feb 2021 05:32:20 +0100 |
Pierre-Yves David |
test-copies: improve description of the B+D case
|
file |
diff |
annotate
|
| Tue, 16 Feb 2021 05:29:04 +0100 |
Pierre-Yves David |
test-copies: improve description of the B+C case
|
file |
diff |
annotate
|
| Tue, 16 Feb 2021 05:26:46 +0100 |
Pierre-Yves David |
test-copies: improve description of the A+B case
|
file |
diff |
annotate
|
| Tue, 16 Feb 2021 05:19:23 +0100 |
Pierre-Yves David |
test-copies: use intermediate variable some commit descriptions
|
file |
diff |
annotate
|
| Mon, 22 Feb 2021 18:48:45 +0100 |
Pierre-Yves David |
test-copies: don't use empty file for "same content" cases
|
file |
diff |
annotate
|
| Thu, 10 Dec 2020 14:25:36 +0100 |
Pierre-Yves David |
test-copies: reinstall initial identical (empty) files for chained copied
|
file |
diff |
annotate
|
| Tue, 02 Feb 2021 07:02:25 +0100 |
Pierre-Yves David |
copy-tracing: add a --compute flag to debugchangedfiles
|
file |
diff |
annotate
|
| Mon, 18 Jan 2021 19:16:49 +0530 |
Pulkit Goyal |
share: move share safe functionality out of experimental
|
file |
diff |
annotate
|
| Mon, 14 Dec 2020 12:08:56 +0100 |
Pierre-Yves David |
copies-tests: update to null in test-copies-chain-merge.t
|
file |
diff |
annotate
|
| Mon, 14 Dec 2020 12:08:16 +0100 |
Pierre-Yves David |
copies-tests: add a summary of all cases created in test-copies-chain-merge.t
|
file |
diff |
annotate
|
| Sun, 13 Dec 2020 19:18:10 +0100 |
Pierre-Yves David |
copies: explain the "arbitrary" copy source pick in case of conflict
|
file |
diff |
annotate
|
| Sun, 13 Dec 2020 20:16:34 +0100 |
Pierre-Yves David |
copies: properly match result during changeset centric copy tracing
|
file |
diff |
annotate
|
| Mon, 30 Nov 2020 14:07:23 +0100 |
Pierre-Yves David |
upgrade: display the list of processed revlog before proceeding
|
file |
diff |
annotate
|
| Thu, 25 Jun 2020 13:13:21 +0530 |
Pulkit Goyal |
upgrade: add support for experimental safe share mode
|
file |
diff |
annotate
|
| Tue, 13 Oct 2020 05:15:44 +0200 |
Pierre-Yves David |
copies: make sure deleted copy info do not overwriting unrelated ones
|
file |
diff |
annotate
|
| Wed, 14 Oct 2020 08:38:58 -0700 |
Martin von Zweigbergk |
tests: add notes about broken `hg log --follow <file>` with copies in extras
|
file |
diff |
annotate
|
| Fri, 23 Oct 2020 10:56:18 -0700 |
Martin von Zweigbergk |
config: add a new [command-templates] section for templates defined by hg
|
file |
diff |
annotate
|
| Tue, 13 Oct 2020 05:14:37 +0200 |
Pierre-Yves David |
upgrade: allow sidedata upgrade to modify revision flag
|
file |
diff |
annotate
|
| Tue, 13 Oct 2020 02:49:03 +0200 |
Pierre-Yves David |
test: move upgrade run and check earlier in test-copies-chain-merge
|
file |
diff |
annotate
|
| Tue, 13 Oct 2020 02:45:24 +0200 |
Pierre-Yves David |
copies: split creation of the graph and actual checking again
|
file |
diff |
annotate
|
| Thu, 08 Oct 2020 09:54:38 -0700 |
Martin von Zweigbergk |
tests: run test-copies-chain-merge.t also with copies in changesets
|
file |
diff |
annotate
|
| Thu, 08 Oct 2020 15:09:28 -0700 |
Martin von Zweigbergk |
tests: update test-copies-chain-merge.t to not use empty files
|
file |
diff |
annotate
|
| Wed, 16 Sep 2020 21:00:02 +0200 |
Pierre-Yves David |
salvaged: properly deal with salvaged file during copy tracing
|
file |
diff |
annotate
|
| Tue, 15 Sep 2020 10:55:17 +0200 |
Pierre-Yves David |
salvaged: persist the salvaged set on disk
|
file |
diff |
annotate
|
| Wed, 30 Sep 2020 09:21:33 +0200 |
Pierre-Yves David |
changing-files: add a debug command display changed files
|
file |
diff |
annotate
|
| Tue, 29 Sep 2020 23:16:09 +0200 |
Pierre-Yves David |
side-data: add a test to check sidedata upgrade
|
file |
diff |
annotate
|
| Thu, 08 Oct 2020 23:14:41 -0700 |
Martin von Zweigbergk |
tests: back out accidentally queued changeset 0627cd03b1e9
|
file |
diff |
annotate
|
| Tue, 06 Oct 2020 15:23:10 -0700 |
Martin von Zweigbergk |
tests: update test-copies-chain-merge.t to not use empty files
|
file |
diff |
annotate
|
| Wed, 07 Oct 2020 13:24:03 +0530 |
Pulkit Goyal |
tests: update/remove outdated comments in test-copies-chain-merge.t
|
file |
diff |
annotate
|
| Fri, 19 Jun 2020 06:15:06 +0200 |
Pierre-Yves David |
copy-tracing: test case where a merge reverted a file deletion
|
file |
diff |
annotate
|
| Fri, 19 Jun 2020 06:04:48 +0200 |
Pierre-Yves David |
copy-tracing: test case where we go across a changed/deleted merge
|
file |
diff |
annotate
|
| Thu, 05 Mar 2020 17:55:05 +0100 |
Pierre-Yves David |
copies: fix the changeset based algorithm regarding merge
|
file |
diff |
annotate
|
| Thu, 09 Apr 2020 16:06:03 +0530 |
Pulkit Goyal |
mergestate: store about files resolved in favour of other
|
file |
diff |
annotate
|
| Thu, 02 Apr 2020 13:53:33 -0700 |
Martin von Zweigbergk |
tests: move verification closer to setup in test-copies-chain-merge.t
|
file |
diff |
annotate
|
| Thu, 02 Apr 2020 13:45:10 -0700 |
Martin von Zweigbergk |
tests: collect all branch creation in one place in test-copies-chain-merge.t
|
file |
diff |
annotate
|
| Sat, 07 Mar 2020 00:30:33 +0100 |
Pierre-Yves David |
copies-tests: remove spurious `]` in the template
|
file |
diff |
annotate
|