log tests/test-copies-chain-merge.t @ 50425:9fa3cda7449e

age author description
Wed, 01 Jun 2022 01:13:13 +0200 Pierre-Yves DAVID debugindex: rename the parent column to mention nodeid
Wed, 01 Jun 2022 00:59:51 +0200 Pierre-Yves David debugindex: align column name on the right
Thu, 19 May 2022 01:34:51 +0100 Pierre-Yves David copies-sdc: mark upgrade action as changelog only
Fri, 14 Jan 2022 09:28:44 -0800 Martin von Zweigbergk merge: consider the file merged when using :merge-{local,other}
Tue, 07 Dec 2021 23:49:35 +0100 Pierre-Yves David test: simplify `debugformat` matching in test-copies-chain-merge
Wed, 19 May 2021 18:35:43 +0200 Simon Sapin dirstate-v2: Add `hg debugupgraderepo` command support
Tue, 04 May 2021 03:05:52 +0200 Pierre-Yves David changelogv2: `copies-side-data` now implies `changelogv2`
Mon, 29 Mar 2021 22:40:54 +0200 Pierre-Yves David changelogv2: introduce a "changelogv2" feature
Mon, 03 May 2021 12:30:24 +0200 Pierre-Yves David side-data: drop the associated config and requirements
Mon, 03 May 2021 12:30:03 +0200 Pierre-Yves David test: no longer directly use the sidedata config and requirements
Fri, 07 May 2021 22:06:25 -0400 Matt Harbison merge with stable
Mon, 19 Apr 2021 11:22:24 +0200 Pierre-Yves David test-copies: test that copies' sidedata can get computed during push
Mon, 19 Apr 2021 11:22:24 +0200 Pierre-Yves David test-copies: test that copies' sidedata can get computed during pull
Mon, 19 Apr 2021 11:22:24 +0200 Pierre-Yves David test-copies: test that copies' sidedata does not get corrupted during push
Mon, 19 Apr 2021 11:22:24 +0200 Pierre-Yves David test-copies: test that copies' sidedata does not get corrupted during pull
Mon, 19 Apr 2021 11:22:24 +0200 Pierre-Yves David test-copies: simplify some conditional output
Sat, 01 May 2021 13:04:56 -0400 Matt Harbison tests: run python script through quoted interpreter instead of directly stable
Thu, 14 Jan 2021 04:58:20 +0100 Pierre-Yves David persistent-nodemap: enable the feature by default when using Rust
Sat, 13 Mar 2021 03:17:00 +0100 Pierre-Yves David copies: distinguish between merged and touched files during upgrade
Mon, 15 Mar 2021 13:37:45 +0100 Pierre-Yves David copies: detect files as `touched/salvaged` if they only existed on one side
Tue, 02 Mar 2021 02:00:29 +0100 Pierre-Yves David test-copies: add a test updating file content while salvaging it
Sat, 13 Mar 2021 04:54:05 +0100 Pierre-Yves David test-copies: show some wrong ChangedFiles upgrade
Wed, 10 Mar 2021 13:14:32 +0530 Pulkit Goyal commit: get info from mergestate whether a file was merged or not
Tue, 02 Mar 2021 00:05:22 +0100 Pierre-Yves David test-copies: add a test updating file content while merging a pure overwrite
Thu, 04 Mar 2021 09:55:06 +0100 Raphaël Gomès format: remove sidedata format variant
Wed, 20 Jan 2021 21:14:06 +0100 Raphaël Gomès revlogv2: allow upgrading to v2
Mon, 01 Mar 2021 20:08:26 +0100 Pierre-Yves David copies: tests and fix parallel computation of changed file information
Wed, 24 Feb 2021 09:27:33 -0800 Martin von Zweigbergk tests: correct a commit description in test-copies-chain-merge.t
Sat, 12 Dec 2020 19:35:08 +0100 Pierre-Yves David copies: detect case when a merge decision overwrite previous data
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
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
Tue, 16 Feb 2021 06:02:09 +0100 Pierre-Yves David test-copies: improve description of the C+H case
Tue, 16 Feb 2021 05:58:22 +0100 Pierre-Yves David test-copies: improve description of the B+C "revert/restore" case
Tue, 16 Feb 2021 05:54:55 +0100 Pierre-Yves David test-copies: improve description of the G+C case
Tue, 16 Feb 2021 05:46:32 +0100 Pierre-Yves David test-copies: improve description of the G+F case
Tue, 16 Feb 2021 05:39:22 +0100 Pierre-Yves David test-copies: improve description of the D+G case
Tue, 16 Feb 2021 05:35:18 +0100 Pierre-Yves David test-copies: improve description of the A+E case
Tue, 16 Feb 2021 05:32:20 +0100 Pierre-Yves David test-copies: improve description of the B+D case
Tue, 16 Feb 2021 05:29:04 +0100 Pierre-Yves David test-copies: improve description of the B+C case
Tue, 16 Feb 2021 05:26:46 +0100 Pierre-Yves David test-copies: improve description of the A+B case
Tue, 16 Feb 2021 05:19:23 +0100 Pierre-Yves David test-copies: use intermediate variable some commit descriptions
Mon, 22 Feb 2021 18:48:45 +0100 Pierre-Yves David test-copies: don't use empty file for "same content" cases
Thu, 10 Dec 2020 14:25:36 +0100 Pierre-Yves David test-copies: reinstall initial identical (empty) files for chained copied
Tue, 02 Feb 2021 07:02:25 +0100 Pierre-Yves David copy-tracing: add a --compute flag to debugchangedfiles
Mon, 18 Jan 2021 19:16:49 +0530 Pulkit Goyal share: move share safe functionality out of experimental