diff --git a/convert-tests/defs.rs b/convert-tests/defs.rs index bb1e3b0..8ac0f07 100644 --- a/convert-tests/defs.rs +++ b/convert-tests/defs.rs @@ -12,7 +12,7 @@ pub(crate) struct Test { #[serde(rename = "svn-revs")] pub(crate) svn_revs: Vec, #[serde(rename = "conv-params")] - pub(crate) conv_params: serde_yaml::Value, + pub(crate) conv_params: String, #[serde(rename = "user-map")] pub(crate) user_map: Option, #[serde(rename = "git-repack", default = "false_")] diff --git a/convert-tests/test.rs b/convert-tests/test.rs index befbfc2..bf5b6d6 100644 --- a/convert-tests/test.rs +++ b/convert-tests/test.rs @@ -24,8 +24,7 @@ pub(crate) fn run_test(test_path: &Path) -> Result<(), String> { } let conv_params_path = temp_dir.join("conv-params.yaml"); - let conv_params_raw = serde_yaml::to_string(&test_def.conv_params).unwrap(); - std::fs::write(&conv_params_path, conv_params_raw.as_bytes()) + std::fs::write(&conv_params_path, test_def.conv_params.as_bytes()) .map_err(|e| format!("failed to write {conv_params_path:?}: {e}"))?; let svn_dump_path = temp_dir.join("svn-dump"); diff --git a/convert-tests/tests/branches/branched-unbranched.yaml b/convert-tests/tests/branches/branched-unbranched.yaml index 3f91df9..4dff948 100644 --- a/convert-tests/tests/branches/branched-unbranched.yaml +++ b/convert-tests/tests/branches/branched-unbranched.yaml @@ -24,7 +24,7 @@ svn-revs: action: add text: "z\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/branches/copy-nonbranch-to-one.yaml b/convert-tests/tests/branches/copy-nonbranch-to-one.yaml index 79db1ff..d56bb77 100644 --- a/convert-tests/tests/branches/copy-nonbranch-to-one.yaml +++ b/convert-tests/tests/branches/copy-nonbranch-to-one.yaml @@ -23,7 +23,7 @@ svn-revs: action: add copy-from-path: trunk -conv-params: +conv-params: | branches: - branches/* rename-branches: diff --git a/convert-tests/tests/branches/copy-nonbranch-to-parent.yaml b/convert-tests/tests/branches/copy-nonbranch-to-parent.yaml index d2621a9..2833daa 100644 --- a/convert-tests/tests/branches/copy-nonbranch-to-parent.yaml +++ b/convert-tests/tests/branches/copy-nonbranch-to-parent.yaml @@ -27,7 +27,7 @@ svn-revs: action: add copy-from-path: branches1 -conv-params: +conv-params: | branches: - branches2/* head: branches2/b1 diff --git a/convert-tests/tests/branches/copy-one-to-nonbranch.yaml b/convert-tests/tests/branches/copy-one-to-nonbranch.yaml index 4e379ba..77fb225 100644 --- a/convert-tests/tests/branches/copy-one-to-nonbranch.yaml +++ b/convert-tests/tests/branches/copy-one-to-nonbranch.yaml @@ -23,7 +23,7 @@ svn-revs: action: add copy-from-path: trunk -conv-params: +conv-params: | branches: - trunk rename-branches: diff --git a/convert-tests/tests/branches/copy-one.yaml b/convert-tests/tests/branches/copy-one.yaml index be5ba2f..fa676c0 100644 --- a/convert-tests/tests/branches/copy-one.yaml +++ b/convert-tests/tests/branches/copy-one.yaml @@ -23,7 +23,7 @@ svn-revs: action: add copy-from-path: trunk -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/branches/copy-parent-to-nonbranch.yaml b/convert-tests/tests/branches/copy-parent-to-nonbranch.yaml index 5945ef0..4712c8c 100644 --- a/convert-tests/tests/branches/copy-parent-to-nonbranch.yaml +++ b/convert-tests/tests/branches/copy-parent-to-nonbranch.yaml @@ -27,7 +27,7 @@ svn-revs: action: add copy-from-path: branches1 -conv-params: +conv-params: | branches: - branches1/* head: branches1/b1 diff --git a/convert-tests/tests/branches/copy-parent.yaml b/convert-tests/tests/branches/copy-parent.yaml index d6cecbb..2deeebc 100644 --- a/convert-tests/tests/branches/copy-parent.yaml +++ b/convert-tests/tests/branches/copy-parent.yaml @@ -27,7 +27,7 @@ svn-revs: action: add copy-from-path: branches1 -conv-params: +conv-params: | branches: - branches1/* - branches2/* diff --git a/convert-tests/tests/branches/copy-replace-parent.yaml b/convert-tests/tests/branches/copy-replace-parent.yaml index 718d47f..2c596d3 100644 --- a/convert-tests/tests/branches/copy-replace-parent.yaml +++ b/convert-tests/tests/branches/copy-replace-parent.yaml @@ -41,7 +41,7 @@ svn-revs: action: replace copy-from-path: branches1 -conv-params: +conv-params: | branches: - branches1/* - branches2/* diff --git a/convert-tests/tests/branches/delete-keep.yaml b/convert-tests/tests/branches/delete-keep.yaml index c314c8b..bf66a3f 100644 --- a/convert-tests/tests/branches/delete-keep.yaml +++ b/convert-tests/tests/branches/delete-keep.yaml @@ -19,7 +19,7 @@ svn-revs: kind: dir action: delete -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/branches/delete-not-keep.yaml b/convert-tests/tests/branches/delete-not-keep.yaml index b75c15c..1c6501a 100644 --- a/convert-tests/tests/branches/delete-not-keep.yaml +++ b/convert-tests/tests/branches/delete-not-keep.yaml @@ -29,7 +29,7 @@ svn-revs: kind: dir action: delete -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/branches/delete-twice.yaml b/convert-tests/tests/branches/delete-twice.yaml index 6819cc6..7326351 100644 --- a/convert-tests/tests/branches/delete-twice.yaml +++ b/convert-tests/tests/branches/delete-twice.yaml @@ -35,7 +35,7 @@ svn-revs: kind: dir action: delete -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/branches/merge-after-cherrypick.yaml b/convert-tests/tests/branches/merge-after-cherrypick.yaml index e952b55..8d95186 100644 --- a/convert-tests/tests/branches/merge-after-cherrypick.yaml +++ b/convert-tests/tests/branches/merge-after-cherrypick.yaml @@ -74,7 +74,7 @@ svn-revs: action: add text: "file D\n" -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/branches/merge-allowed-gap.yaml b/convert-tests/tests/branches/merge-allowed-gap.yaml index 3c30eff..753d214 100644 --- a/convert-tests/tests/branches/merge-allowed-gap.yaml +++ b/convert-tests/tests/branches/merge-allowed-gap.yaml @@ -50,7 +50,7 @@ svn-revs: action: add text: "file B\n" -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/branches/merge-and-keep.yaml b/convert-tests/tests/branches/merge-and-keep.yaml index 3fd40d0..e465eb6 100644 --- a/convert-tests/tests/branches/merge-and-keep.yaml +++ b/convert-tests/tests/branches/merge-and-keep.yaml @@ -60,7 +60,7 @@ svn-revs: action: add text: "file D\n" -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/branches/merge-and-revert-keep.yaml b/convert-tests/tests/branches/merge-and-revert-keep.yaml index 5f03b92..76fadc6 100644 --- a/convert-tests/tests/branches/merge-and-revert-keep.yaml +++ b/convert-tests/tests/branches/merge-and-revert-keep.yaml @@ -60,7 +60,7 @@ svn-revs: kind: file action: delete -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/branches/merge-and-revert-not-keep.yaml b/convert-tests/tests/branches/merge-and-revert-not-keep.yaml index 8613247..c902743 100644 --- a/convert-tests/tests/branches/merge-and-revert-not-keep.yaml +++ b/convert-tests/tests/branches/merge-and-revert-not-keep.yaml @@ -60,7 +60,7 @@ svn-revs: kind: file action: delete -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/branches/merge-during-create.yaml b/convert-tests/tests/branches/merge-during-create.yaml index 4c68fee..8501094 100644 --- a/convert-tests/tests/branches/merge-during-create.yaml +++ b/convert-tests/tests/branches/merge-during-create.yaml @@ -51,7 +51,7 @@ svn-revs: action: add text: "file C\n" -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/branches/merge-simple-ignore.yaml b/convert-tests/tests/branches/merge-simple-ignore.yaml index a8a8bd0..4f76f9a 100644 --- a/convert-tests/tests/branches/merge-simple-ignore.yaml +++ b/convert-tests/tests/branches/merge-simple-ignore.yaml @@ -50,7 +50,7 @@ svn-revs: action: add text: "file C\n" -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/branches/merge-simple.yaml b/convert-tests/tests/branches/merge-simple.yaml index d5fdcec..d1a08d2 100644 --- a/convert-tests/tests/branches/merge-simple.yaml +++ b/convert-tests/tests/branches/merge-simple.yaml @@ -50,7 +50,7 @@ svn-revs: action: add text: "file C\n" -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/branches/merge-twice.yaml b/convert-tests/tests/branches/merge-twice.yaml index 8e16ee8..7b41d27 100644 --- a/convert-tests/tests/branches/merge-twice.yaml +++ b/convert-tests/tests/branches/merge-twice.yaml @@ -63,7 +63,7 @@ svn-revs: action: add text: "file C\n" -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/branches/merge-with-cherrypick.yaml b/convert-tests/tests/branches/merge-with-cherrypick.yaml index 6ef22b3..4304507 100644 --- a/convert-tests/tests/branches/merge-with-cherrypick.yaml +++ b/convert-tests/tests/branches/merge-with-cherrypick.yaml @@ -89,7 +89,7 @@ svn-revs: action: add text: "file E\n" -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/branches/not-merge-gap.yaml b/convert-tests/tests/branches/not-merge-gap.yaml index d93b6ff..9107448 100644 --- a/convert-tests/tests/branches/not-merge-gap.yaml +++ b/convert-tests/tests/branches/not-merge-gap.yaml @@ -50,7 +50,7 @@ svn-revs: action: add text: "file C\n" -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/branches/recover-one.yaml b/convert-tests/tests/branches/recover-one.yaml index 436bbf1..dddb1c4 100644 --- a/convert-tests/tests/branches/recover-one.yaml +++ b/convert-tests/tests/branches/recover-one.yaml @@ -24,7 +24,7 @@ svn-revs: copy-from-rev: 1 copy-from-path: trunk -conv-params: +conv-params: | branches: - trunk - trunk2 diff --git a/convert-tests/tests/branches/recover-parent.yaml b/convert-tests/tests/branches/recover-parent.yaml index d11360b..5da409c 100644 --- a/convert-tests/tests/branches/recover-parent.yaml +++ b/convert-tests/tests/branches/recover-parent.yaml @@ -34,7 +34,7 @@ svn-revs: copy-from-rev: 1 copy-from-path: branches1 -conv-params: +conv-params: | branches: - branches1/* - branches2/* diff --git a/convert-tests/tests/branches/recreate.yaml b/convert-tests/tests/branches/recreate.yaml index be00a6e..cd0d00e 100644 --- a/convert-tests/tests/branches/recreate.yaml +++ b/convert-tests/tests/branches/recreate.yaml @@ -26,7 +26,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/branches/unbranched-custom.yaml b/convert-tests/tests/branches/unbranched-custom.yaml index 0706029..063bbae 100644 --- a/convert-tests/tests/branches/unbranched-custom.yaml +++ b/convert-tests/tests/branches/unbranched-custom.yaml @@ -14,7 +14,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | head: "" unbranched-name: onebranch diff --git a/convert-tests/tests/commit-meta/custom.yaml b/convert-tests/tests/commit-meta/custom.yaml index b5b3cf5..45219f2 100644 --- a/convert-tests/tests/commit-meta/custom.yaml +++ b/convert-tests/tests/commit-meta/custom.yaml @@ -25,7 +25,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | branches: - trunk user-map-file: user-map.txt diff --git a/convert-tests/tests/commit-meta/default.yaml b/convert-tests/tests/commit-meta/default.yaml index 0609789..5ef23a4 100644 --- a/convert-tests/tests/commit-meta/default.yaml +++ b/convert-tests/tests/commit-meta/default.yaml @@ -34,7 +34,7 @@ svn-revs: action: change text: "z\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/copy-root.yaml b/convert-tests/tests/copy-root.yaml index c3a4a68..76e7052 100644 --- a/convert-tests/tests/copy-root.yaml +++ b/convert-tests/tests/copy-root.yaml @@ -27,7 +27,7 @@ svn-revs: action: add copy-from-path: "" -conv-params: +conv-params: | branches: - branches/* - backup/branches/* diff --git a/convert-tests/tests/delete-files-branched.yaml b/convert-tests/tests/delete-files-branched.yaml index b24a2e5..4ceceeb 100644 --- a/convert-tests/tests/delete-files-branched.yaml +++ b/convert-tests/tests/delete-files-branched.yaml @@ -21,7 +21,7 @@ svn-revs: action: add copy-from-path: trunk/y -conv-params: +conv-params: | branches: - trunk delete-files: diff --git a/convert-tests/tests/delete-files-unbranched.yaml b/convert-tests/tests/delete-files-unbranched.yaml index 27bb1c0..f2080b2 100644 --- a/convert-tests/tests/delete-files-unbranched.yaml +++ b/convert-tests/tests/delete-files-unbranched.yaml @@ -18,7 +18,7 @@ svn-revs: action: add copy-from-path: y -conv-params: +conv-params: | head: "" delete-files: - "**/y" diff --git a/convert-tests/tests/dump-sources/compressed-bzip2.yaml b/convert-tests/tests/dump-sources/compressed-bzip2.yaml index c0c8608..044f626 100644 --- a/convert-tests/tests/dump-sources/compressed-bzip2.yaml +++ b/convert-tests/tests/dump-sources/compressed-bzip2.yaml @@ -19,7 +19,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/dump-sources/compressed-gzip.yaml b/convert-tests/tests/dump-sources/compressed-gzip.yaml index 3b9d70b..d3f2bf6 100644 --- a/convert-tests/tests/dump-sources/compressed-gzip.yaml +++ b/convert-tests/tests/dump-sources/compressed-gzip.yaml @@ -19,7 +19,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/dump-sources/compressed-lz4.yaml b/convert-tests/tests/dump-sources/compressed-lz4.yaml index 5e4f41e..6eac26b 100644 --- a/convert-tests/tests/dump-sources/compressed-lz4.yaml +++ b/convert-tests/tests/dump-sources/compressed-lz4.yaml @@ -19,7 +19,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/dump-sources/compressed-xz.yaml b/convert-tests/tests/dump-sources/compressed-xz.yaml index 7dca4c1..1f3be51 100644 --- a/convert-tests/tests/dump-sources/compressed-xz.yaml +++ b/convert-tests/tests/dump-sources/compressed-xz.yaml @@ -19,7 +19,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/dump-sources/compressed-zstd.yaml b/convert-tests/tests/dump-sources/compressed-zstd.yaml index be80117..2121d46 100644 --- a/convert-tests/tests/dump-sources/compressed-zstd.yaml +++ b/convert-tests/tests/dump-sources/compressed-zstd.yaml @@ -19,7 +19,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/dump-sources/uncompressed.yaml b/convert-tests/tests/dump-sources/uncompressed.yaml index 11c2f14..64bdff0 100644 --- a/convert-tests/tests/dump-sources/uncompressed.yaml +++ b/convert-tests/tests/dump-sources/uncompressed.yaml @@ -19,7 +19,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/fail/change-non-existing-file.yaml b/convert-tests/tests/fail/change-non-existing-file.yaml index f82c3e2..b5e2fbd 100644 --- a/convert-tests/tests/fail/change-non-existing-file.yaml +++ b/convert-tests/tests/fail/change-non-existing-file.yaml @@ -13,7 +13,7 @@ svn-revs: action: change text: "x\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/fail/copy-file-as-dir.yaml b/convert-tests/tests/fail/copy-file-as-dir.yaml index 86315f7..ed6750a 100644 --- a/convert-tests/tests/fail/copy-file-as-dir.yaml +++ b/convert-tests/tests/fail/copy-file-as-dir.yaml @@ -17,7 +17,7 @@ svn-revs: action: add copy-from-path: trunk/x -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/fail/copy-from-non-existing-path.yaml b/convert-tests/tests/fail/copy-from-non-existing-path.yaml index f47f2b2..407fc96 100644 --- a/convert-tests/tests/fail/copy-from-non-existing-path.yaml +++ b/convert-tests/tests/fail/copy-from-non-existing-path.yaml @@ -14,7 +14,7 @@ svn-revs: copy-from-rev: 1 copy-from-path: trunk/y -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/fail/copy-from-non-existing-rev.yaml b/convert-tests/tests/fail/copy-from-non-existing-rev.yaml index 91c57fc..aa08f56 100644 --- a/convert-tests/tests/fail/copy-from-non-existing-rev.yaml +++ b/convert-tests/tests/fail/copy-from-non-existing-rev.yaml @@ -14,7 +14,7 @@ svn-revs: copy-from-rev: 3 copy-from-path: trunk/y -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/fail/delete-non-existing-file.yaml b/convert-tests/tests/fail/delete-non-existing-file.yaml index e131f3e..eaeed8d 100644 --- a/convert-tests/tests/fail/delete-non-existing-file.yaml +++ b/convert-tests/tests/fail/delete-non-existing-file.yaml @@ -12,7 +12,7 @@ svn-revs: kind: file action: delete -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/fail/delete-with-copy-from.yaml b/convert-tests/tests/fail/delete-with-copy-from.yaml index 768e01a..819dad0 100644 --- a/convert-tests/tests/fail/delete-with-copy-from.yaml +++ b/convert-tests/tests/fail/delete-with-copy-from.yaml @@ -17,7 +17,7 @@ svn-revs: action: delete copy-from-path: trunk/x -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/fail/delete-with-text.yaml b/convert-tests/tests/fail/delete-with-text.yaml index a5a100e..401f96f 100644 --- a/convert-tests/tests/fail/delete-with-text.yaml +++ b/convert-tests/tests/fail/delete-with-text.yaml @@ -17,7 +17,7 @@ svn-revs: action: delete text: "x\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/fail/deleted-head.yaml b/convert-tests/tests/fail/deleted-head.yaml index 821d1ed..10f7283 100644 --- a/convert-tests/tests/fail/deleted-head.yaml +++ b/convert-tests/tests/fail/deleted-head.yaml @@ -32,7 +32,7 @@ svn-revs: kind: dir action: delete -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/fail/invalid-sync-from-uuid.yaml b/convert-tests/tests/fail/invalid-sync-from-uuid.yaml index ffdfa83..c1e32ca 100644 --- a/convert-tests/tests/fail/invalid-sync-from-uuid.yaml +++ b/convert-tests/tests/fail/invalid-sync-from-uuid.yaml @@ -3,7 +3,7 @@ svn-revs: props: svn:sync-from-uuid: This-is-not-a-UUID -conv-params: {} +conv-params: "" failed: true diff --git a/convert-tests/tests/fail/invalid-uuid.yaml b/convert-tests/tests/fail/invalid-uuid.yaml index 31a3995..b19d130 100644 --- a/convert-tests/tests/fail/invalid-uuid.yaml +++ b/convert-tests/tests/fail/invalid-uuid.yaml @@ -2,7 +2,7 @@ svn-uuid: This-is-not-a-UUID svn-revs: [] -conv-params: {} +conv-params: "" failed: true diff --git a/convert-tests/tests/fail/missing-file-add-text.yaml b/convert-tests/tests/fail/missing-file-add-text.yaml index 8ea616a..e896ada 100644 --- a/convert-tests/tests/fail/missing-file-add-text.yaml +++ b/convert-tests/tests/fail/missing-file-add-text.yaml @@ -9,7 +9,7 @@ svn-revs: kind: file action: add -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/fail/missing-file-replace-text.yaml b/convert-tests/tests/fail/missing-file-replace-text.yaml index 3ab30d0..d8a38b6 100644 --- a/convert-tests/tests/fail/missing-file-replace-text.yaml +++ b/convert-tests/tests/fail/missing-file-replace-text.yaml @@ -19,7 +19,7 @@ svn-revs: kind: file action: replace -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/fail/non-monotonic-rev-no.yaml b/convert-tests/tests/fail/non-monotonic-rev-no.yaml index 613b701..1b640ee 100644 --- a/convert-tests/tests/fail/non-monotonic-rev-no.yaml +++ b/convert-tests/tests/fail/non-monotonic-rev-no.yaml @@ -2,7 +2,7 @@ svn-revs: - no: 2 - no: 1 -conv-params: {} +conv-params: "" failed: true diff --git a/convert-tests/tests/fail/repeated-rev-no copy.yaml b/convert-tests/tests/fail/repeated-rev-no copy.yaml index 00f90fe..a1a63ce 100644 --- a/convert-tests/tests/fail/repeated-rev-no copy.yaml +++ b/convert-tests/tests/fail/repeated-rev-no copy.yaml @@ -2,7 +2,7 @@ svn-revs: - no: 1 - no: 1 -conv-params: {} +conv-params: "" failed: true diff --git a/convert-tests/tests/fail/replace-non-existing-file.yaml b/convert-tests/tests/fail/replace-non-existing-file.yaml index 4a4c889..e78d80b 100644 --- a/convert-tests/tests/fail/replace-non-existing-file.yaml +++ b/convert-tests/tests/fail/replace-non-existing-file.yaml @@ -13,7 +13,7 @@ svn-revs: action: replace text: "x\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/fail/tag-head.yaml b/convert-tests/tests/fail/tag-head.yaml index aecf599..deb04aa 100644 --- a/convert-tests/tests/fail/tag-head.yaml +++ b/convert-tests/tests/fail/tag-head.yaml @@ -23,7 +23,7 @@ svn-revs: action: add copy-from-path: trunk -conv-params: +conv-params: | branches: - trunk tags: diff --git a/convert-tests/tests/git-repack.yaml b/convert-tests/tests/git-repack.yaml index 8dea97e..883c134 100644 --- a/convert-tests/tests/git-repack.yaml +++ b/convert-tests/tests/git-repack.yaml @@ -17,7 +17,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/head/custom-branch.yaml b/convert-tests/tests/head/custom-branch.yaml index ec6934b..fefad79 100644 --- a/convert-tests/tests/head/custom-branch.yaml +++ b/convert-tests/tests/head/custom-branch.yaml @@ -26,7 +26,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/head/default.yaml b/convert-tests/tests/head/default.yaml index d9d37f7..dbd5650 100644 --- a/convert-tests/tests/head/default.yaml +++ b/convert-tests/tests/head/default.yaml @@ -26,7 +26,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/head/deleted-keep.yaml b/convert-tests/tests/head/deleted-keep.yaml index 06f85ff..e9d0bab 100644 --- a/convert-tests/tests/head/deleted-keep.yaml +++ b/convert-tests/tests/head/deleted-keep.yaml @@ -32,7 +32,7 @@ svn-revs: kind: dir action: delete -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/head/explicit-trunk.yaml b/convert-tests/tests/head/explicit-trunk.yaml index cc22941..dac0aa1 100644 --- a/convert-tests/tests/head/explicit-trunk.yaml +++ b/convert-tests/tests/head/explicit-trunk.yaml @@ -26,7 +26,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/head/unbranched-custom.yaml b/convert-tests/tests/head/unbranched-custom.yaml index 08156f5..464682f 100644 --- a/convert-tests/tests/head/unbranched-custom.yaml +++ b/convert-tests/tests/head/unbranched-custom.yaml @@ -14,7 +14,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | head: "" unbranched-name: master diff --git a/convert-tests/tests/head/unbranched.yaml b/convert-tests/tests/head/unbranched.yaml index faea838..7aa343c 100644 --- a/convert-tests/tests/head/unbranched.yaml +++ b/convert-tests/tests/head/unbranched.yaml @@ -14,7 +14,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | head: "" git-revs: diff --git a/convert-tests/tests/ignore/branched.yaml b/convert-tests/tests/ignore/branched.yaml index e505745..c640c7a 100644 --- a/convert-tests/tests/ignore/branched.yaml +++ b/convert-tests/tests/ignore/branched.yaml @@ -58,7 +58,7 @@ svn-revs: action: change props: {} -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/ignore/disabled-branched.yaml b/convert-tests/tests/ignore/disabled-branched.yaml index d5be6af..f748ff5 100644 --- a/convert-tests/tests/ignore/disabled-branched.yaml +++ b/convert-tests/tests/ignore/disabled-branched.yaml @@ -58,7 +58,7 @@ svn-revs: action: change props: {} -conv-params: +conv-params: | branches: - trunk generate-gitignore: false diff --git a/convert-tests/tests/ignore/disabled-unbranched.yaml b/convert-tests/tests/ignore/disabled-unbranched.yaml index aa2e846..b44e432 100644 --- a/convert-tests/tests/ignore/disabled-unbranched.yaml +++ b/convert-tests/tests/ignore/disabled-unbranched.yaml @@ -68,7 +68,7 @@ svn-revs: action: change props: {} -conv-params: +conv-params: | branches: - trunk generate-gitignore: false diff --git a/convert-tests/tests/ignore/unbranched.yaml b/convert-tests/tests/ignore/unbranched.yaml index cc3d4df..f7ccf65 100644 --- a/convert-tests/tests/ignore/unbranched.yaml +++ b/convert-tests/tests/ignore/unbranched.yaml @@ -68,7 +68,7 @@ svn-revs: action: change props: {} -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/ops-branched/basic.yaml b/convert-tests/tests/ops-branched/basic.yaml index fd8d5af..284963c 100644 --- a/convert-tests/tests/ops-branched/basic.yaml +++ b/convert-tests/tests/ops-branched/basic.yaml @@ -17,7 +17,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/ops-branched/change-file-exec.yaml b/convert-tests/tests/ops-branched/change-file-exec.yaml index f5baaf9..fa95aa4 100644 --- a/convert-tests/tests/ops-branched/change-file-exec.yaml +++ b/convert-tests/tests/ops-branched/change-file-exec.yaml @@ -49,9 +49,9 @@ svn-revs: # Without prop section text: "4\n" -conv-params: +conv-params: | branches: - - trunk + - trunk git-revs: - rev: trunk~5 diff --git a/convert-tests/tests/ops-branched/copy-dir.yaml b/convert-tests/tests/ops-branched/copy-dir.yaml index 1256235..9fe7daa 100644 --- a/convert-tests/tests/ops-branched/copy-dir.yaml +++ b/convert-tests/tests/ops-branched/copy-dir.yaml @@ -20,7 +20,7 @@ svn-revs: action: add copy-from-path: trunk/dir -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/ops-branched/copy-file.yaml b/convert-tests/tests/ops-branched/copy-file.yaml index e38ac0b..6368a70 100644 --- a/convert-tests/tests/ops-branched/copy-file.yaml +++ b/convert-tests/tests/ops-branched/copy-file.yaml @@ -17,7 +17,7 @@ svn-revs: action: add copy-from-path: trunk/x -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/ops-branched/copy-modify-file.yaml b/convert-tests/tests/ops-branched/copy-modify-file.yaml index b4820d1..a1a101c 100644 --- a/convert-tests/tests/ops-branched/copy-modify-file.yaml +++ b/convert-tests/tests/ops-branched/copy-modify-file.yaml @@ -18,7 +18,7 @@ svn-revs: copy-from-path: trunk/original text: "modified\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/ops-branched/copy-replace-file.yaml b/convert-tests/tests/ops-branched/copy-replace-file.yaml index dcec224..ffdac2b 100644 --- a/convert-tests/tests/ops-branched/copy-replace-file.yaml +++ b/convert-tests/tests/ops-branched/copy-replace-file.yaml @@ -21,7 +21,7 @@ svn-revs: action: replace copy-from-path: trunk/x -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/ops-branched/copy-replace-modify-file.yaml b/convert-tests/tests/ops-branched/copy-replace-modify-file.yaml index 232181d..9e5663e 100644 --- a/convert-tests/tests/ops-branched/copy-replace-modify-file.yaml +++ b/convert-tests/tests/ops-branched/copy-replace-modify-file.yaml @@ -22,7 +22,7 @@ svn-revs: copy-from-path: trunk/x text: "file 3\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/ops-branched/delete-dir.yaml b/convert-tests/tests/ops-branched/delete-dir.yaml index 6c19b96..60a986e 100644 --- a/convert-tests/tests/ops-branched/delete-dir.yaml +++ b/convert-tests/tests/ops-branched/delete-dir.yaml @@ -19,7 +19,7 @@ svn-revs: kind: dir action: delete -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/ops-branched/delete-file.yaml b/convert-tests/tests/ops-branched/delete-file.yaml index e5b18b3..fbbeeab 100644 --- a/convert-tests/tests/ops-branched/delete-file.yaml +++ b/convert-tests/tests/ops-branched/delete-file.yaml @@ -16,7 +16,7 @@ svn-revs: kind: file action: delete -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/ops-branched/file-to-symlink.yaml b/convert-tests/tests/ops-branched/file-to-symlink.yaml index c1abf3f..50e8ab7 100644 --- a/convert-tests/tests/ops-branched/file-to-symlink.yaml +++ b/convert-tests/tests/ops-branched/file-to-symlink.yaml @@ -46,7 +46,7 @@ svn-revs: svn:special: "*" text: "link target3" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/ops-branched/modify-file.yaml b/convert-tests/tests/ops-branched/modify-file.yaml index 2e4327d..1cc228e 100644 --- a/convert-tests/tests/ops-branched/modify-file.yaml +++ b/convert-tests/tests/ops-branched/modify-file.yaml @@ -17,7 +17,7 @@ svn-revs: action: change text: "modified\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/ops-branched/replace-file.yaml b/convert-tests/tests/ops-branched/replace-file.yaml index fe47c54..e0e3c30 100644 --- a/convert-tests/tests/ops-branched/replace-file.yaml +++ b/convert-tests/tests/ops-branched/replace-file.yaml @@ -17,7 +17,7 @@ svn-revs: action: replace text: "replaced\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/ops-unbranched/basic.yaml b/convert-tests/tests/ops-unbranched/basic.yaml index 177da96..352f483 100644 --- a/convert-tests/tests/ops-unbranched/basic.yaml +++ b/convert-tests/tests/ops-unbranched/basic.yaml @@ -14,7 +14,7 @@ svn-revs: action: add text: "y\n" -conv-params: +conv-params: | head: "" git-revs: diff --git a/convert-tests/tests/ops-unbranched/change-file-exec.yaml b/convert-tests/tests/ops-unbranched/change-file-exec.yaml index 4a9c56f..6a940fa 100644 --- a/convert-tests/tests/ops-unbranched/change-file-exec.yaml +++ b/convert-tests/tests/ops-unbranched/change-file-exec.yaml @@ -46,7 +46,7 @@ svn-revs: # Without prop section text: "4\n" -conv-params: +conv-params: | head: "" git-revs: diff --git a/convert-tests/tests/ops-unbranched/copy-dir.yaml b/convert-tests/tests/ops-unbranched/copy-dir.yaml index ac106d3..3794ab1 100644 --- a/convert-tests/tests/ops-unbranched/copy-dir.yaml +++ b/convert-tests/tests/ops-unbranched/copy-dir.yaml @@ -17,7 +17,7 @@ svn-revs: action: add copy-from-path: dir -conv-params: +conv-params: | head: "" git-revs: diff --git a/convert-tests/tests/ops-unbranched/copy-file.yaml b/convert-tests/tests/ops-unbranched/copy-file.yaml index b1b34d9..715e6ea 100644 --- a/convert-tests/tests/ops-unbranched/copy-file.yaml +++ b/convert-tests/tests/ops-unbranched/copy-file.yaml @@ -14,7 +14,7 @@ svn-revs: action: add copy-from-path: x -conv-params: +conv-params: | head: "" git-revs: diff --git a/convert-tests/tests/ops-unbranched/copy-modify-file.yaml b/convert-tests/tests/ops-unbranched/copy-modify-file.yaml index 493c025..e03bb39 100644 --- a/convert-tests/tests/ops-unbranched/copy-modify-file.yaml +++ b/convert-tests/tests/ops-unbranched/copy-modify-file.yaml @@ -15,7 +15,7 @@ svn-revs: copy-from-path: original text: "modified\n" -conv-params: +conv-params: | head: "" git-revs: diff --git a/convert-tests/tests/ops-unbranched/copy-replace-file.yaml b/convert-tests/tests/ops-unbranched/copy-replace-file.yaml index 65204cb..f11d2b3 100644 --- a/convert-tests/tests/ops-unbranched/copy-replace-file.yaml +++ b/convert-tests/tests/ops-unbranched/copy-replace-file.yaml @@ -18,7 +18,7 @@ svn-revs: action: replace copy-from-path: x -conv-params: +conv-params: | head: "" git-revs: diff --git a/convert-tests/tests/ops-unbranched/copy-replace-modify-file.yaml b/convert-tests/tests/ops-unbranched/copy-replace-modify-file.yaml index ce44af7..3f95a58 100644 --- a/convert-tests/tests/ops-unbranched/copy-replace-modify-file.yaml +++ b/convert-tests/tests/ops-unbranched/copy-replace-modify-file.yaml @@ -19,7 +19,7 @@ svn-revs: copy-from-path: x text: "file 3\n" -conv-params: +conv-params: | head: "" git-revs: diff --git a/convert-tests/tests/ops-unbranched/delete-dir.yaml b/convert-tests/tests/ops-unbranched/delete-dir.yaml index de6e91c..14eb836 100644 --- a/convert-tests/tests/ops-unbranched/delete-dir.yaml +++ b/convert-tests/tests/ops-unbranched/delete-dir.yaml @@ -16,7 +16,7 @@ svn-revs: kind: dir action: delete -conv-params: +conv-params: | head: "" git-revs: diff --git a/convert-tests/tests/ops-unbranched/delete-file.yaml b/convert-tests/tests/ops-unbranched/delete-file.yaml index 70925ff..013ce36 100644 --- a/convert-tests/tests/ops-unbranched/delete-file.yaml +++ b/convert-tests/tests/ops-unbranched/delete-file.yaml @@ -16,7 +16,7 @@ svn-revs: kind: file action: delete -conv-params: +conv-params: | head: "" git-revs: diff --git a/convert-tests/tests/ops-unbranched/file-to-symlink.yaml b/convert-tests/tests/ops-unbranched/file-to-symlink.yaml index c5f5258..2052600 100644 --- a/convert-tests/tests/ops-unbranched/file-to-symlink.yaml +++ b/convert-tests/tests/ops-unbranched/file-to-symlink.yaml @@ -46,7 +46,7 @@ svn-revs: svn:special: "*" text: "link target3" -conv-params: +conv-params: | head: "" git-revs: diff --git a/convert-tests/tests/ops-unbranched/modify-file.yaml b/convert-tests/tests/ops-unbranched/modify-file.yaml index 89a8fcd..bf1d748 100644 --- a/convert-tests/tests/ops-unbranched/modify-file.yaml +++ b/convert-tests/tests/ops-unbranched/modify-file.yaml @@ -14,7 +14,7 @@ svn-revs: action: change text: "modified\n" -conv-params: +conv-params: | head: "" git-revs: diff --git a/convert-tests/tests/ops-unbranched/replace-file.yaml b/convert-tests/tests/ops-unbranched/replace-file.yaml index 35cf42a..db355a6 100644 --- a/convert-tests/tests/ops-unbranched/replace-file.yaml +++ b/convert-tests/tests/ops-unbranched/replace-file.yaml @@ -14,7 +14,7 @@ svn-revs: action: replace text: "replaced\n" -conv-params: +conv-params: | head: "" git-revs: diff --git a/convert-tests/tests/prop-delta/change-file-exec.yaml b/convert-tests/tests/prop-delta/change-file-exec.yaml index 6099a84..1b32002 100644 --- a/convert-tests/tests/prop-delta/change-file-exec.yaml +++ b/convert-tests/tests/prop-delta/change-file-exec.yaml @@ -56,7 +56,7 @@ svn-revs: # Without prop section text: "4\n" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/prop-delta/ignore-branched.yaml b/convert-tests/tests/prop-delta/ignore-branched.yaml index ceb0dee..dbfc44f 100644 --- a/convert-tests/tests/prop-delta/ignore-branched.yaml +++ b/convert-tests/tests/prop-delta/ignore-branched.yaml @@ -56,7 +56,7 @@ svn-revs: f svn:global-ignores: null -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/prop-delta/ignore-unbranched.yaml b/convert-tests/tests/prop-delta/ignore-unbranched.yaml index 30ce7f8..c8610c5 100644 --- a/convert-tests/tests/prop-delta/ignore-unbranched.yaml +++ b/convert-tests/tests/prop-delta/ignore-unbranched.yaml @@ -66,7 +66,7 @@ svn-revs: f svn:global-ignores: null -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/prop-delta/merge-and-keep.yaml b/convert-tests/tests/prop-delta/merge-and-keep.yaml index 67e7b25..bc1625b 100644 --- a/convert-tests/tests/prop-delta/merge-and-keep.yaml +++ b/convert-tests/tests/prop-delta/merge-and-keep.yaml @@ -64,7 +64,7 @@ svn-revs: action: add text: "file D\n" -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/prop-delta/merge-and-revert-keep.yaml b/convert-tests/tests/prop-delta/merge-and-revert-keep.yaml index ee8cdcc..ec09847 100644 --- a/convert-tests/tests/prop-delta/merge-and-revert-keep.yaml +++ b/convert-tests/tests/prop-delta/merge-and-revert-keep.yaml @@ -64,7 +64,7 @@ svn-revs: kind: file action: delete -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/prop-delta/merge-and-revert-not-keep.yaml b/convert-tests/tests/prop-delta/merge-and-revert-not-keep.yaml index 7127ffd..78f0831 100644 --- a/convert-tests/tests/prop-delta/merge-and-revert-not-keep.yaml +++ b/convert-tests/tests/prop-delta/merge-and-revert-not-keep.yaml @@ -64,7 +64,7 @@ svn-revs: kind: file action: delete -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/symlink.yaml b/convert-tests/tests/symlink.yaml index 0760eb5..fc430df 100644 --- a/convert-tests/tests/symlink.yaml +++ b/convert-tests/tests/symlink.yaml @@ -19,7 +19,7 @@ svn-revs: action: change text: "link target2" -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/tags/branch-from-tag.yaml b/convert-tests/tests/tags/branch-from-tag.yaml index cf71df7..3a6552f 100644 --- a/convert-tests/tests/tags/branch-from-tag.yaml +++ b/convert-tests/tests/tags/branch-from-tag.yaml @@ -33,7 +33,7 @@ svn-revs: action: add copy-from-path: tags/t1 -conv-params: +conv-params: | branches: - trunk - branches/* diff --git a/convert-tests/tests/tags/custom-meta.yaml b/convert-tests/tests/tags/custom-meta.yaml index ee26f07..fb32294 100644 --- a/convert-tests/tests/tags/custom-meta.yaml +++ b/convert-tests/tests/tags/custom-meta.yaml @@ -34,7 +34,7 @@ svn-revs: action: add copy-from-path: trunk -conv-params: +conv-params: | branches: - trunk rename-branches: diff --git a/convert-tests/tests/tags/default-meta.yaml b/convert-tests/tests/tags/default-meta.yaml index 7623e83..2e7c6fe 100644 --- a/convert-tests/tests/tags/default-meta.yaml +++ b/convert-tests/tests/tags/default-meta.yaml @@ -34,7 +34,7 @@ svn-revs: action: add copy-from-path: trunk -conv-params: +conv-params: | branches: - trunk rename-branches: diff --git a/convert-tests/tests/tags/from-branch-with-changes.yaml b/convert-tests/tests/tags/from-branch-with-changes.yaml index deab816..973a853 100644 --- a/convert-tests/tests/tags/from-branch-with-changes.yaml +++ b/convert-tests/tests/tags/from-branch-with-changes.yaml @@ -27,7 +27,7 @@ svn-revs: action: change text: "y\n" -conv-params: +conv-params: | branches: - trunk tags: diff --git a/convert-tests/tests/tags/from-branch.yaml b/convert-tests/tests/tags/from-branch.yaml index 2b85941..79b32a1 100644 --- a/convert-tests/tests/tags/from-branch.yaml +++ b/convert-tests/tests/tags/from-branch.yaml @@ -23,7 +23,7 @@ svn-revs: action: add copy-from-path: trunk -conv-params: +conv-params: | branches: - trunk rename-branches: diff --git a/convert-tests/tests/tags/from-empty.yaml b/convert-tests/tests/tags/from-empty.yaml index b3f7fe1..d86ffd2 100644 --- a/convert-tests/tests/tags/from-empty.yaml +++ b/convert-tests/tests/tags/from-empty.yaml @@ -16,7 +16,7 @@ svn-revs: action: add text: "x\n" -conv-params: +conv-params: | tags: - tags/* head: tags/t1 diff --git a/convert-tests/tests/tags/from-tag.yaml b/convert-tests/tests/tags/from-tag.yaml index 3f0293b..5be713d 100644 --- a/convert-tests/tests/tags/from-tag.yaml +++ b/convert-tests/tests/tags/from-tag.yaml @@ -30,7 +30,7 @@ svn-revs: action: add copy-from-path: tags/t1 -conv-params: +conv-params: | branches: - trunk rename-branches: diff --git a/convert-tests/tests/tags/modify.yaml b/convert-tests/tests/tags/modify.yaml index 3e2dcdf..2e1fd1f 100644 --- a/convert-tests/tests/tags/modify.yaml +++ b/convert-tests/tests/tags/modify.yaml @@ -30,7 +30,7 @@ svn-revs: action: change text: "y\n" -conv-params: +conv-params: | branches: - trunk tags: diff --git a/convert-tests/tests/text-delta/copy-modify-file.yaml b/convert-tests/tests/text-delta/copy-modify-file.yaml index e7f594a..d426171 100644 --- a/convert-tests/tests/text-delta/copy-modify-file.yaml +++ b/convert-tests/tests/text-delta/copy-modify-file.yaml @@ -34,7 +34,7 @@ svn-revs: 0x64, # new data 'd' ] -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/text-delta/copy-replace-modify-file.yaml b/convert-tests/tests/text-delta/copy-replace-modify-file.yaml index d32ffbf..dc90e46 100644 --- a/convert-tests/tests/text-delta/copy-replace-modify-file.yaml +++ b/convert-tests/tests/text-delta/copy-replace-modify-file.yaml @@ -40,7 +40,7 @@ svn-revs: 0x64, # new data 'd' ] -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/text-delta/modify-file.yaml b/convert-tests/tests/text-delta/modify-file.yaml index 37836d0..9ee93d9 100644 --- a/convert-tests/tests/text-delta/modify-file.yaml +++ b/convert-tests/tests/text-delta/modify-file.yaml @@ -33,7 +33,7 @@ svn-revs: 0x64, # new data 'd' ] -conv-params: +conv-params: | branches: - trunk diff --git a/convert-tests/tests/text-delta/modify-symlink.yaml b/convert-tests/tests/text-delta/modify-symlink.yaml index 4601596..65fd628 100644 --- a/convert-tests/tests/text-delta/modify-symlink.yaml +++ b/convert-tests/tests/text-delta/modify-symlink.yaml @@ -37,7 +37,7 @@ svn-revs: 0x64, # new data 'd' ] -conv-params: +conv-params: | branches: - trunk