log tests/test-copies-chain-merge.t @ 45152:b3b0cd8b9366

age author description
Thu, 05 Mar 2020 17:55:05 +0100 Pierre-Yves David copies: fix the changeset based algorithm regarding merge
Thu, 09 Apr 2020 16:06:03 +0530 Pulkit Goyal mergestate: store about files resolved in favour of other
Thu, 02 Apr 2020 13:53:33 -0700 Martin von Zweigbergk tests: move verification closer to setup in test-copies-chain-merge.t
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
Sat, 07 Mar 2020 00:30:33 +0100 Pierre-Yves David copies-tests: remove spurious `]` in the template
Tue, 03 Mar 2020 15:56:00 +0100 Pierre-Yves David copies-tests: add a case where with merge with an overwritten files
Tue, 03 Mar 2020 15:46:28 +0100 Pierre-Yves David copies-tests: add a case where a file is deleted/added but with a merge
Tue, 03 Mar 2020 12:35:24 +0100 Pierre-Yves David copies-tests: add a test with a rename overwriting another file
Sat, 29 Feb 2020 19:50:05 +0100 Pierre-Yves David copies-tests: add a `h` to the root commit (for chain merge tests)
Sat, 07 Mar 2020 00:03:41 +0100 Pierre-Yves David copies-tests: remove the final summary
Tue, 03 Mar 2020 13:18:31 +0100 Pierre-Yves David copies-tests: clarify the description of the EA/AE cases
Tue, 03 Mar 2020 09:27:31 +0100 Pierre-Yves David copies-tests: update the analysis of the BD/DB cases
Fri, 06 Mar 2020 11:02:02 +0100 Pierre-Yves David copies-tests: swap two branch description
Sat, 29 Feb 2020 19:31:33 +0100 Pierre-Yves David copies-tests: update to null after setup for output stability
Tue, 03 Mar 2020 08:55:27 +0100 Pierre-Yves David copies-tests: remove extra log call at the end of the chain-merge test file
Fri, 13 Dec 2019 16:49:05 +0100 Pierre-Yves David copies: add a new test dedicated to testing chain of changeset with merge