screened 2024-05-22 16:46:28+00:00

bfrk · May 22, 2024 · 8c5b5ce · 8c5b5ce
1 parent ba808bd
commit 8c5b5ce
Show file tree

Hide file tree

Showing 409 changed files with 13 additions and 17 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -19,13 +19,13 @@ jobs:
           - windows-2022
         ghc:
           - 8.4.4
-#           - 8.6.5
-#           - 8.8.2
-#           - 8.10.7
-#           - 9.0.2
-#           - 9.2.8
-#           - 9.4.8
-#           - 9.6.4
+          - 8.6.5
+          - 8.8.2
+          - 8.10.7
+          - 9.0.2
+          - 9.2.8
+          - 9.4.8
+          - 9.6.4
           - 9.8.2
         cabal:
           - '3.10'

diff --git a/contrib/buildbot-try.sh b/contrib/buildbot-try.sh
diff --git a/contrib/checkdeps.sh b/contrib/checkdeps.sh
diff --git a/contrib/cygwin-wrapper.bash b/contrib/cygwin-wrapper.bash
diff --git a/contrib/darcs-shell b/contrib/darcs-shell
diff --git a/contrib/darcshoogle b/contrib/darcshoogle
diff --git a/contrib/runHLint.sh b/contrib/runHLint.sh
diff --git a/contrib/update_roundup.pl b/contrib/update_roundup.pl
diff --git a/contrib/upload.cgi b/contrib/upload.cgi
diff --git a/release/distributed-context b/release/distributed-context
@@ -1 +1 @@
-Just "\nContext:\n\n\n[cabal file: add hie flag\nBen Franksen <[email protected]>**20240510175237\n Ignore-this: 1d42ad05750e08d23ec0f6a387c08ceb051de31ec48a97826573f14a56e3a0ae16584ed3577f82c0\n] \n\n[ci: upgrade actions/cache, fix cache/save warnings\nBen Franksen <[email protected]>**20240510155801\n Ignore-this: 1b2f726a24693810ec0fe995af9a0be968ca86728cc26758ca9582516968397ca1d3b4be1c478a8b\n] \n\n[resolve issue2718: avoid using conflictedPaths to detect whether we have conflicts\nBen Franksen <[email protected]>**20240510130208\n Ignore-this: 6aeca7588b2418053dd27039d0f2bcbecbee965e2e8a270f24f89b427fe787f9d811ef1eaf1a61bb\n \n This adds an explicit test named haveConflicts, which looks at the \"sum\" of\n the mangled and unmangled conflicts. This is cleaner because in principle\n (albeit not in practice) there could be conflicts that do not involve any\n file paths. Consequently, the warning message for conflicts is now separate\n from the listing of the affected paths.\n] \n\n[two optimizations in remove command\nBen Franksen <[email protected]>**20240510071822\n Ignore-this: b4d3049af67f9824469de5692e6337f5dd0586e921b973632e74c9d180287f8d30460777119bc81f\n \n Frst, avoid duplicate call to readPristineAndPending by passing the pristine\n tree to makeRemovePatch. Also, use a path filter before expanding the tree,\n to avoid expansion of irrelevant parts of the tree.\n] \n\n[ci: remove ghc-8.2.2 from build matrix\nBen Franksen <[email protected]>**20240509190406\n Ignore-this: f0a8e2f11701fc743212fda56d6106d5364cefead256b63d06d363e787b409a74318611cf1ce06da\n \n Building the dependencies now fails on macos-13 with ghc-8.2.2. We already\n excluded it for the other systems due to various build problems, so can as\n well remove it entirely.\n] \n\n[resolve issue2714: cannot remove recursively\nBen Franksen <[email protected]>**20240506183723\n Ignore-this: fcab2e01d6fe9dc16facda2a569eeb4454c3c1208cdcd31bb9c630334290de1de6dba8d5611666d9\n] \n\n[put back the set-default hint\nGanesh Sittampalam <[email protected]>**20240309154509\n Ignore-this: 7f52711f8776994dcb902a5d23741d6c6af6f3113c1ec30a2691348235d16cd81689a21eff8d334d\n \n This rolls back patch 8c1131290443248d423cabe0b5566f840e6cb3b3\n] \n\n[Add a --ghcflags/-g option to the test suite\nGanesh Sittampalam <[email protected]>**20240309145422\n Ignore-this: aba41611871b0ee986beee2e1bd6fb9af6690bf7315737fdb1c166222685ee8be703003d492eb010\n \n This allows arbitrary GHC flags to be passed on to the ghc\n invocations used to build helper exes in various test scripts.\n \n For example this allows -dynamic to be passed on systems with\n shared libraries.\n \n Based on a patch by Vekhir <[email protected]>\n] \n\n[Darcs.UI.External: fix warnings about head\nGanesh Sittampalam <[email protected]>**20240225215257\n Ignore-this: 35ed1b4cd0f4c1af70133228547dac7fce5067a1482cbe6810c515f82389d70cb1f2bed0a7a32fc9\n] \n\n[Darcs.UI.Commands.ShowAuthors: fix warnings about head\nGanesh Sittampalam <[email protected]>**20240225215214\n Ignore-this: ee64bb835284ac05403ea170915e8ed2191de27042e69edea61f5743bd752ea14e44082f54d90f9a\n] \n\n[use headErr/tailErr from safe for several head/tails\nGanesh Sittampalam <[email protected]>**20240225215204\n Ignore-this: bb7a9c0ef437f841d13a7eb2a0a24abcf5ee4d26a2856feac2966a4f89a52a5b20560bea920fbc42\n \n They aren't trivial to fix in a concise way, and safe\n is generally a useful package to have around anyway.\n] \n\n[Darcs.Test.Patch.FileUUIDModel: fix warning about head/tail\nGanesh Sittampalam <[email protected]>**20240225215135\n Ignore-this: 740956f48bd3127b4f77c0c7350b8d229e0fd7be3bda48932a61341169cc976d6e7ed3dedc7cad11\n] \n\n[Darcs.UI.Commands.Record: fix warning about head\nGanesh Sittampalam <[email protected]>**20240225205552\n Ignore-this: e288796d05da69107f281ccd311e1980cfc7d71aaab72b3c2ab2619c0f1ceaff76a497ae37705689\n] \n\n[Darcs.UI.Commands.Convert.Import: fix warning about head\nGanesh Sittampalam <[email protected]>**20240225205524\n Ignore-this: a8c51b94ff04c6bed7959f43c3d518d6171048755646fd1146a7996ac6d5c5013db900b51ff29504\n] \n\n[Darcs.UI.Commands.Convert.Export: fix warnings about tail\nGanesh Sittampalam <[email protected]>**20240225204214\n Ignore-this: a49d956016082487081f71fcace360f65cb92ad17e10e195651821d6e009b70b9d01b49a2b0c8708\n] \n\n[add some tests for Darcs.UI.Commands.Convert.Export.patchAuthor\nGanesh Sittampalam <[email protected]>**20240225204119\n Ignore-this: 4a3a731c86732c64a27b9e9719950e01a94ef320b37259113c693e75080283806a23835c423e40b9\n] \n\n[darcs.hs: fix warnings about head/tail\nGanesh Sittampalam <[email protected]>**20240225201516\n Ignore-this: 8f6fec34b8e77474a3b1ee5e252fb08fe8439c57a4a0ad35df64c06fe15df18f83c82855d8435e15\n] \n\n[Darcs.Patch.Info: fix warning about head\nGanesh Sittampalam <[email protected]>**20240225195147\n Ignore-this: f50bcf1a170c6c8941c688021e20d1eee24e59b2afe7a5f01488c9c4f2cb92d58aed586f146a0a98\n] \n\n[Darcs.Util.Diff.Patience: fix warning about head\nGanesh Sittampalam <[email protected]>**20240225194009\n Ignore-this: ccfaccc22725d81839f5caf605742eb7f3ef916572fdd7a53bcc7f7fa837ef9d71729e7c71d4503\n] \n\n[Darcs.Patch.Annotate: fix warning about head\nGanesh Sittampalam <[email protected]>**20240225182503\n Ignore-this: 4c48b8aadee71311e2a01f5b53a678e07f53339d98e843ebc01ebd381163fe0a9d7f3721c2c5dc58\n] \n\n[bump version to 2.19.1\nGanesh Sittampalam <[email protected]>**20240225175930\n Ignore-this: b8e8df00de306f7de2363d1805c152be15cc5b5ab99a57be8f9db19bb8552d0d25a196eeb2dc20c4\n] \n\n[TAG 2.18.1\nGanesh Sittampalam <[email protected]>**20240225173219\n Ignore-this: dc3a92eafcab9d4fa9f53b1811d4c99d330615a8c202bff1b77f44d551d21684eee81e96c69be62b\n] \n"
+Just "\nContext:\n\n\n[add docs to configureHttpConnectionManager\nBen Franksen <[email protected]>**20240519110146\n Ignore-this: ec69432373410c479f90ddda39b98a25a754db4d9e14055197cb47cfde85596faf2026e34f8fb11a\n] \n\n[add missing constraints data-default-class\nBen Franksen <[email protected]>**20240519102829\n Ignore-this: 9d3f5afdeea6274f2532c2aa7fa407461bcddb3516a47a9fccb069500275e587d5cc252f41f6b96b\n] \n\n[Fix missing import in D.R.PatchIndex\nGanesh Sittampalam <[email protected]>**20240513100533\n Ignore-this: bea59b7dfbd7e591a57f4bfcc7983003f79db4b4fe41f6072d904e9947a38d5936e75c9cdec0df86\n \n GHC 9.10 complains about it, not sure why earlier\n versions don't.\n] \n\n[ci: run tests with latest supported ghc version\nBen Franksen <[email protected]>**20240517115615\n Ignore-this: 574d1033079aa6d6f5f42739ff36e353baf9b5503134f9b0cff839a02a64e101a778781f401661dc\n] \n\n[adapt supported ghc versions in README.md\nBen Franksen <[email protected]>**20240517113218\n Ignore-this: c4e2e475e9c439bf0b240fd5dfffc6f57b43b94ecb57329e2686286b47f214a562150f0b336fce27\n] \n\n[ci: add ghc-9.8.2 to build matrix\nBen Franksen <[email protected]>**20240517113141\n Ignore-this: a3103d91ec762a45b0e5b8a2a4f317d4358c58c0a94420f43784c623050af0381cdb9dc65a87bbc7\n] \n\n[resolve issue2715: hub.darcs.net does not support \"Extended Main Secret\"\nBen Franksen <[email protected]>**20240515142402\n Ignore-this: 60c6b240cd1563fe7b3fc83845610e2c4d2ec00a6d5a4ada2e53e9fff4ff1022780a3dfa64d31a3e\n \n We use a new addition to crypton-connection in order to change the default\n setting back to old (tls < 2.0) default. For ghc < 8.8 crypton-connection\n is not available, so instead we constrain tls as before.\n] \n\n[support time 1.14\nGanesh Sittampalam <[email protected]>**20240513000056\n Ignore-this: 929d96355713e762a5e77549597b6bd816992f93af1ef7125cdcf9caa396f6f5d82b2a8d71ff51e8\n \n This currently needs --allow-newer to use\n] \n\n[support QuickCheck 2.15\nGanesh Sittampalam <[email protected]>**20240513000037\n Ignore-this: f078dc88530d2fdc51610fcadca12d0b355ae5c6594e76643f1592ccd329b5a8c817374f0522e0cc\n \n This currently needs --allow-newer to use\n] \n\n[support network 3.2\nGanesh Sittampalam <[email protected]>**20240512234608\n Ignore-this: e50507030aecbb0cb90d369f331765cde093c746c257d6a301ea0d06ba91353b8d7aff9369e52bd3\n] \n\n[Resolve conflict in version bump from 2.18 branch\nGanesh Sittampalam <[email protected]>**20240324221309\n Ignore-this: d035acfcb3339c22e37a8b4bc8f662258886e1f5ad786cd87d08edf9624cb3888606bf38d8177d26\n] \n\n[TAG 2.18.2\nGanesh Sittampalam <[email protected]>**20240324205714\n Ignore-this: d03c480e509ce62eacaf0f1ad40f0cb7821163cac313d5ee4c977e7f77f9ec020b9e61214ddafe49\n] \n\n[bump version to 2.18.2\nGanesh Sittampalam <[email protected]>**20240324205701\n Ignore-this: dd7bfdf697e6bc700288ee4a9406ed5d76e7ee049bc13a483c9ca3321903620c775e6fc133a12608\n] \n\n[CHANGELOG for 2.18.2\nGanesh Sittampalam <[email protected]>**20240324205626\n Ignore-this: a7ea5d6b7ff3712201eb93651cdbf8653872da99839f527a6a6aa4a6f685b0707e867484ba805a57\n] \n\n[ci: upgrade actions/cache, fix cache/save warnings\nBen Franksen <[email protected]>**20240510155801\n Ignore-this: 1b2f726a24693810ec0fe995af9a0be968ca86728cc26758ca9582516968397ca1d3b4be1c478a8b\n] \n\n[resolve issue2718: avoid using conflictedPaths to detect whether we have conflicts\nBen Franksen <[email protected]>**20240510130208\n Ignore-this: 6aeca7588b2418053dd27039d0f2bcbecbee965e2e8a270f24f89b427fe787f9d811ef1eaf1a61bb\n \n This adds an explicit test named haveConflicts, which looks at the \"sum\" of\n the mangled and unmangled conflicts. This is cleaner because in principle\n (albeit not in practice) there could be conflicts that do not involve any\n file paths. Consequently, the warning message for conflicts is now separate\n from the listing of the affected paths.\n] \n\n[two optimizations in remove command\nBen Franksen <[email protected]>**20240510071822\n Ignore-this: b4d3049af67f9824469de5692e6337f5dd0586e921b973632e74c9d180287f8d30460777119bc81f\n \n Frst, avoid duplicate call to readPristineAndPending by passing the pristine\n tree to makeRemovePatch. Also, use a path filter before expanding the tree,\n to avoid expansion of irrelevant parts of the tree.\n] \n\n[ci: remove ghc-8.2.2 from build matrix\nBen Franksen <[email protected]>**20240509190406\n Ignore-this: f0a8e2f11701fc743212fda56d6106d5364cefead256b63d06d363e787b409a74318611cf1ce06da\n \n Building the dependencies now fails on macos-13 with ghc-8.2.2. We already\n excluded it for the other systems due to various build problems, so can as\n well remove it entirely.\n] \n\n[resolve issue2714: cannot remove recursively\nBen Franksen <[email protected]>**20240506183723\n Ignore-this: fcab2e01d6fe9dc16facda2a569eeb4454c3c1208cdcd31bb9c630334290de1de6dba8d5611666d9\n] \n\n[put back the set-default hint\nGanesh Sittampalam <[email protected]>**20240309154509\n Ignore-this: 7f52711f8776994dcb902a5d23741d6c6af6f3113c1ec30a2691348235d16cd81689a21eff8d334d\n \n This rolls back patch 8c1131290443248d423cabe0b5566f840e6cb3b3\n] \n\n[Add a --ghcflags/-g option to the test suite\nGanesh Sittampalam <[email protected]>**20240309145422\n Ignore-this: aba41611871b0ee986beee2e1bd6fb9af6690bf7315737fdb1c166222685ee8be703003d492eb010\n \n This allows arbitrary GHC flags to be passed on to the ghc\n invocations used to build helper exes in various test scripts.\n \n For example this allows -dynamic to be passed on systems with\n shared libraries.\n \n Based on a patch by Vekhir <[email protected]>\n] \n\n[Darcs.UI.External: fix warnings about head\nGanesh Sittampalam <[email protected]>**20240225215257\n Ignore-this: 35ed1b4cd0f4c1af70133228547dac7fce5067a1482cbe6810c515f82389d70cb1f2bed0a7a32fc9\n] \n\n[Darcs.UI.Commands.ShowAuthors: fix warnings about head\nGanesh Sittampalam <[email protected]>**20240225215214\n Ignore-this: ee64bb835284ac05403ea170915e8ed2191de27042e69edea61f5743bd752ea14e44082f54d90f9a\n] \n\n[use headErr/tailErr from safe for several head/tails\nGanesh Sittampalam <[email protected]>**20240225215204\n Ignore-this: bb7a9c0ef437f841d13a7eb2a0a24abcf5ee4d26a2856feac2966a4f89a52a5b20560bea920fbc42\n \n They aren't trivial to fix in a concise way, and safe\n is generally a useful package to have around anyway.\n] \n\n[Darcs.Test.Patch.FileUUIDModel: fix warning about head/tail\nGanesh Sittampalam <[email protected]>**20240225215135\n Ignore-this: 740956f48bd3127b4f77c0c7350b8d229e0fd7be3bda48932a61341169cc976d6e7ed3dedc7cad11\n] \n\n[Darcs.UI.Commands.Record: fix warning about head\nGanesh Sittampalam <[email protected]>**20240225205552\n Ignore-this: e288796d05da69107f281ccd311e1980cfc7d71aaab72b3c2ab2619c0f1ceaff76a497ae37705689\n] \n\n[Darcs.UI.Commands.Convert.Import: fix warning about head\nGanesh Sittampalam <[email protected]>**20240225205524\n Ignore-this: a8c51b94ff04c6bed7959f43c3d518d6171048755646fd1146a7996ac6d5c5013db900b51ff29504\n] \n\n[Darcs.UI.Commands.Convert.Export: fix warnings about tail\nGanesh Sittampalam <[email protected]>**20240225204214\n Ignore-this: a49d956016082487081f71fcace360f65cb92ad17e10e195651821d6e009b70b9d01b49a2b0c8708\n] \n\n[add some tests for Darcs.UI.Commands.Convert.Export.patchAuthor\nGanesh Sittampalam <[email protected]>**20240225204119\n Ignore-this: 4a3a731c86732c64a27b9e9719950e01a94ef320b37259113c693e75080283806a23835c423e40b9\n] \n\n[darcs.hs: fix warnings about head/tail\nGanesh Sittampalam <[email protected]>**20240225201516\n Ignore-this: 8f6fec34b8e77474a3b1ee5e252fb08fe8439c57a4a0ad35df64c06fe15df18f83c82855d8435e15\n] \n\n[Darcs.Patch.Info: fix warning about head\nGanesh Sittampalam <[email protected]>**20240225195147\n Ignore-this: f50bcf1a170c6c8941c688021e20d1eee24e59b2afe7a5f01488c9c4f2cb92d58aed586f146a0a98\n] \n\n[Darcs.Util.Diff.Patience: fix warning about head\nGanesh Sittampalam <[email protected]>**20240225194009\n Ignore-this: ccfaccc22725d81839f5caf605742eb7f3ef916572fdd7a53bcc7f7fa837ef9d71729e7c71d4503\n] \n\n[Darcs.Patch.Annotate: fix warning about head\nGanesh Sittampalam <[email protected]>**20240225182503\n Ignore-this: 4c48b8aadee71311e2a01f5b53a678e07f53339d98e843ebc01ebd381163fe0a9d7f3721c2c5dc58\n] \n\n[bump version to 2.19.1\nGanesh Sittampalam <[email protected]>**20240225175930\n Ignore-this: b8e8df00de306f7de2363d1805c152be15cc5b5ab99a57be8f9db19bb8552d0d25a196eeb2dc20c4\n] \n\n[TAG 2.18.1\nGanesh Sittampalam <[email protected]>**20240225173219\n Ignore-this: dc3a92eafcab9d4fa9f53b1811d4c99d330615a8c202bff1b77f44d551d21684eee81e96c69be62b\n] \n"
diff --git a/release/distributed-version b/release/distributed-version
@@ -1 +1 @@
-Just 21
+Just 17
diff --git a/release/release.sh b/release/release.sh
diff --git a/shelly/test/examples/drain.sh b/shelly/test/examples/drain.sh
diff --git a/shelly/test/examples/printer.sh b/shelly/test/examples/printer.sh
diff --git a/shelly/test/examples/test.sh b/shelly/test/examples/test.sh
diff --git a/shelly/test/testall b/shelly/test/testall
diff --git a/stack.yaml b/stack.yaml
@@ -1,12 +1,8 @@
-resolver: nightly-2024-05-21
+resolver: lts-21.25
 
 packages:
 - .
 
 extra-deps:
-- Cabal-syntax-3.10.3.0
-- crypton-connection-0.4.0
-- directory-1.3.8.5
-- haskeline-0.8.2.1
-- process-1.6.20.0
 - strict-identity-0.1.0.0
+- safe-0.3.21
diff --git a/tests/EXAMPLE.sh b/tests/EXAMPLE.sh
diff --git a/tests/add.sh b/tests/add.sh
diff --git a/tests/add_permissions.sh b/tests/add_permissions.sh
diff --git a/tests/amend.sh b/tests/amend.sh
diff --git a/tests/annotate.sh b/tests/annotate.sh
diff --git a/tests/apply-reorder.sh b/tests/apply-reorder.sh
diff --git a/tests/apply-unclean-tag.sh b/tests/apply-unclean-tag.sh
diff --git a/tests/apply.sh b/tests/apply.sh
diff --git a/tests/argument_parsing.sh b/tests/argument_parsing.sh
diff --git a/tests/ask_deps.sh b/tests/ask_deps.sh
diff --git a/tests/bad-format.sh b/tests/bad-format.sh
diff --git a/tests/bin/convert-writer.sh b/tests/bin/convert-writer.sh
diff --git a/tests/binary.sh b/tests/binary.sh
diff --git a/tests/boring-files.sh b/tests/boring-files.sh
diff --git a/tests/broken_move.sh b/tests/broken_move.sh
diff --git a/tests/broken_pending.sh b/tests/broken_pending.sh
diff --git a/tests/clean-command.sh b/tests/clean-command.sh
diff --git a/tests/clone.sh b/tests/clone.sh
diff --git a/tests/conflict-chain-resolution.sh b/tests/conflict-chain-resolution.sh
diff --git a/tests/conflict-depends-resolution.sh b/tests/conflict-depends-resolution.sh
diff --git a/tests/conflict-doppleganger.sh b/tests/conflict-doppleganger.sh
diff --git a/tests/conflict-fight-failure.sh b/tests/conflict-fight-failure.sh
diff --git a/tests/conflict-fight.sh b/tests/conflict-fight.sh
diff --git a/tests/conflict-reporting.sh b/tests/conflict-reporting.sh
diff --git a/tests/convert-darcs2.sh b/tests/convert-darcs2.sh
diff --git a/tests/convert-import-export-non-ascii.sh b/tests/convert-import-export-non-ascii.sh
diff --git a/tests/convert_export.sh b/tests/convert_export.sh
diff --git a/tests/decoalesce-add-remove.sh b/tests/decoalesce-add-remove.sh
diff --git a/tests/decoalesce-move.sh b/tests/decoalesce-move.sh
diff --git a/tests/decoalesce-replace.sh b/tests/decoalesce-replace.sh
diff --git a/tests/decoalesce-rmdir.sh b/tests/decoalesce-rmdir.sh
diff --git a/tests/decoalesce-split.sh b/tests/decoalesce-split.sh
diff --git a/tests/devnull.sh b/tests/devnull.sh
diff --git a/tests/diff.sh b/tests/diff.sh
diff --git a/tests/disable.sh b/tests/disable.sh
diff --git a/tests/dist.sh b/tests/dist.sh
diff --git a/tests/emailformat.sh b/tests/emailformat.sh
diff --git a/tests/empty_inventory.sh b/tests/empty_inventory.sh
diff --git a/tests/external-resolution.sh b/tests/external-resolution.sh
diff --git a/tests/failed-amend-should-not-break-repo.sh b/tests/failed-amend-should-not-break-repo.sh
diff --git a/tests/failing-index-argument.sh b/tests/failing-index-argument.sh
diff --git a/tests/failing-issue1190_unmarked_hunk_replace_conflict.sh b/tests/failing-issue1190_unmarked_hunk_replace_conflict.sh
diff --git a/tests/failing-issue1317_list-options_subdir.sh b/tests/failing-issue1317_list-options_subdir.sh
diff --git a/tests/failing-issue1396_changepref-conflict.sh b/tests/failing-issue1396_changepref-conflict.sh
diff --git a/tests/failing-issue1406.sh b/tests/failing-issue1406.sh
diff --git a/tests/failing-issue1461_case_folding.sh b/tests/failing-issue1461_case_folding.sh
diff --git a/tests/failing-issue1577-revert-deletes-new-files.sh b/tests/failing-issue1577-revert-deletes-new-files.sh
diff --git a/tests/failing-issue1610_get_extra.sh b/tests/failing-issue1610_get_extra.sh
diff --git a/tests/failing-issue1702-optimize-relink-vs-cache.sh b/tests/failing-issue1702-optimize-relink-vs-cache.sh
diff --git a/tests/failing-issue1790_darcs-send.sh b/tests/failing-issue1790_darcs-send.sh
diff --git a/tests/failing-issue1829-inconsistent-conflictor.sh b/tests/failing-issue1829-inconsistent-conflictor.sh
diff --git a/tests/failing-issue1926_amend-record_ignores_--index.sh b/tests/failing-issue1926_amend-record_ignores_--index.sh
diff --git a/tests/failing-issue2100-add-failures.sh b/tests/failing-issue2100-add-failures.sh
diff --git a/tests/failing-issue2138-whatsnew-s.sh b/tests/failing-issue2138-whatsnew-s.sh
diff --git a/tests/failing-issue2186-apply--reply-conflict.sh b/tests/failing-issue2186-apply--reply-conflict.sh
diff --git a/tests/failing-issue2186-apply--reply-ok.sh b/tests/failing-issue2186-apply--reply-ok.sh
diff --git a/tests/failing-issue2187-apply--test-non-interactive.sh b/tests/failing-issue2187-apply--test-non-interactive.sh
diff --git a/tests/failing-issue2203-only-list-toplevel-deleted-dirs.sh b/tests/failing-issue2203-only-list-toplevel-deleted-dirs.sh
diff --git a/tests/failing-issue2213-lastregrets-dependencies.sh b/tests/failing-issue2213-lastregrets-dependencies.sh
diff --git a/tests/failing-issue2219-no-working.sh b/tests/failing-issue2219-no-working.sh
diff --git a/tests/failing-issue2234-rollback-under-tag-with-filename.sh b/tests/failing-issue2234-rollback-under-tag-with-filename.sh
diff --git a/tests/failing-issue2256-diff-empty-argument.sh b/tests/failing-issue2256-diff-empty-argument.sh
diff --git a/tests/failing-issue2272-rebase-unsuspend-copes-with-unrecorded-changes.sh b/tests/failing-issue2272-rebase-unsuspend-copes-with-unrecorded-changes.sh
diff --git a/tests/failing-issue2303-diagnostic-for-bad-patch-index-permissions.sh b/tests/failing-issue2303-diagnostic-for-bad-patch-index-permissions.sh
diff --git a/tests/failing-issue2383-hunk-edit-fails.sh b/tests/failing-issue2383-hunk-edit-fails.sh
diff --git a/tests/failing-issue2386-no-trailing-EOL.sh b/tests/failing-issue2386-no-trailing-EOL.sh
diff --git a/tests/failing-issue2443-timestamp_index_keeps_unrecorded_addfile.sh b/tests/failing-issue2443-timestamp_index_keeps_unrecorded_addfile.sh
diff --git a/tests/failing-issue390_whatsnew.sh b/tests/failing-issue390_whatsnew.sh
diff --git a/tests/failing-merging_newlines.sh b/tests/failing-merging_newlines.sh
diff --git a/tests/failing-newlines.sh b/tests/failing-newlines.sh
diff --git a/tests/failing-nice-resolutions.sh b/tests/failing-nice-resolutions.sh
diff --git a/tests/failing-pristine-problems.sh b/tests/failing-pristine-problems.sh
diff --git a/tests/failing-rebase-conflicting.sh b/tests/failing-rebase-conflicting.sh
diff --git a/tests/failing-record-scaling.sh b/tests/failing-record-scaling.sh
diff --git a/tests/filepath.sh b/tests/filepath.sh
diff --git a/tests/git_import_delete_empty_directories.sh b/tests/git_import_delete_empty_directories.sh
diff --git a/tests/git_quoted_filenames.sh b/tests/git_quoted_filenames.sh
diff --git a/tests/git_rename_and_copy_files.sh b/tests/git_rename_and_copy_files.sh
diff --git a/tests/git_rename_dir.sh b/tests/git_rename_dir.sh
diff --git a/tests/gzcrcs.sh b/tests/gzcrcs.sh
diff --git a/tests/harness.sh b/tests/harness.sh
diff --git a/tests/hashed_inventory.sh b/tests/hashed_inventory.sh
diff --git a/tests/hidden_conflict.sh b/tests/hidden_conflict.sh
diff --git a/tests/hidden_conflict2.sh b/tests/hidden_conflict2.sh
diff --git a/tests/hijack.sh b/tests/hijack.sh
diff --git a/tests/hunk-editor.sh b/tests/hunk-editor.sh
diff --git a/tests/ignore-this.sh b/tests/ignore-this.sh
diff --git a/tests/ignoretimes.sh b/tests/ignoretimes.sh
diff --git a/tests/inherit-default.sh b/tests/inherit-default.sh
diff --git a/tests/init.sh b/tests/init.sh
diff --git a/tests/invalid_absolute_paths.sh b/tests/invalid_absolute_paths.sh
diff --git a/tests/invalid_pending_after_mv_to_self.sh b/tests/invalid_pending_after_mv_to_self.sh
diff --git a/tests/issue1014_identical_patches.sh b/tests/issue1014_identical_patches.sh
diff --git a/tests/issue1017_whatsnew_stack.sh b/tests/issue1017_whatsnew_stack.sh
diff --git a/tests/issue1039.sh b/tests/issue1039.sh
diff --git a/tests/issue1043_geteff_a.sh b/tests/issue1043_geteff_a.sh
diff --git a/tests/issue1043_geteff_b.sh b/tests/issue1043_geteff_b.sh
diff --git a/tests/issue1057-pull-from-current-repo-via-symlink.sh b/tests/issue1057-pull-from-current-repo-via-symlink.sh
diff --git a/tests/issue1078_symlink.sh b/tests/issue1078_symlink.sh
diff --git a/tests/issue1101.sh b/tests/issue1101.sh
diff --git a/tests/issue1105.sh b/tests/issue1105.sh
diff --git a/tests/issue1196_whatsnew_falsely_lists_all_changes.sh b/tests/issue1196_whatsnew_falsely_lists_all_changes.sh
diff --git a/tests/issue121-amend-ask-deps.sh b/tests/issue121-amend-ask-deps.sh
diff --git a/tests/issue1210-no-global-cache-in-sources.sh b/tests/issue1210-no-global-cache-in-sources.sh
diff --git a/tests/issue1224_convert-darcs2-repository.sh b/tests/issue1224_convert-darcs2-repository.sh
diff --git a/tests/issue1269_setpref_predist.sh b/tests/issue1269_setpref_predist.sh
diff --git a/tests/issue1277-repo-format.sh b/tests/issue1277-repo-format.sh
diff --git a/tests/issue1300_record_delete-file.sh b/tests/issue1300_record_delete-file.sh
diff --git a/tests/issue1316-2.sh b/tests/issue1316-2.sh
diff --git a/tests/issue1316.sh b/tests/issue1316.sh
diff --git a/tests/issue1325_pending_minimisation.sh b/tests/issue1325_pending_minimisation.sh
diff --git a/tests/issue1327.sh b/tests/issue1327.sh
diff --git a/tests/issue1332_add_r_boring.sh b/tests/issue1332_add_r_boring.sh
diff --git a/tests/issue1344_abort_early_cant_send.sh b/tests/issue1344_abort_early_cant_send.sh
diff --git a/tests/issue1373_replace_token_chars.sh b/tests/issue1373_replace_token_chars.sh
diff --git a/tests/issue1392_authorspelling.sh b/tests/issue1392_authorspelling.sh
diff --git a/tests/issue1401_bug_in_get_extra.sh b/tests/issue1401_bug_in_get_extra.sh
diff --git a/tests/issue1442_encoding_round-trip.sh b/tests/issue1442_encoding_round-trip.sh
diff --git a/tests/issue1446.sh b/tests/issue1446.sh
diff --git a/tests/issue1465_ortryrunning.sh b/tests/issue1465_ortryrunning.sh
@@ -77,8 +77,8 @@ PATH=..:$DARCSDIR \
 darcs record    -lam 'Initial commit.' --edit </dev/null &> log-2
 darcs changes   > changes-2
 darcs unrecord  -a
-grep "vi" changes-2
-egrep -i 'vi|emacs|nano|edit' log-2
+grep -w 'vi' changes-2
+grep -w 'vi' log-2
 
 # Normal failure (eg. user hit ^-C)
 # If Darcs did the right thing, the output won't make any mention of

diff --git a/tests/issue1488_whatsnew-l.sh b/tests/issue1488_whatsnew-l.sh
diff --git a/tests/issue1514-send-minimize.sh b/tests/issue1514-send-minimize.sh
diff --git a/tests/issue1522_trailing_slash_borkage.sh b/tests/issue1522_trailing_slash_borkage.sh
diff --git a/tests/issue154_pull_dir_not_empty.sh b/tests/issue154_pull_dir_not_empty.sh
diff --git a/tests/issue1558_xml_output_gz_extension.sh b/tests/issue1558_xml_output_gz_extension.sh
diff --git a/tests/issue1579_diff_opts.sh b/tests/issue1579_diff_opts.sh
diff --git a/tests/issue1609-conflict-markup-depends-on-patch-order.sh b/tests/issue1609-conflict-markup-depends-on-patch-order.sh
diff --git a/tests/issue1611_amend-tag.sh b/tests/issue1611_amend-tag.sh
diff --git a/tests/issue1618-amend-preserve-logfile.sh b/tests/issue1618-amend-preserve-logfile.sh
diff --git a/tests/issue1620-record-lies-about-leaving-logfile.sh b/tests/issue1620-record-lies-about-leaving-logfile.sh
diff --git a/tests/issue1636-match-hunk.sh b/tests/issue1636-match-hunk.sh
diff --git a/tests/issue1640_apply_stdin.sh b/tests/issue1640_apply_stdin.sh
diff --git a/tests/issue1645-ignore-symlinks-case-fold.sh b/tests/issue1645-ignore-symlinks-case-fold.sh
diff --git a/tests/issue1645-ignore-symlinks.sh b/tests/issue1645-ignore-symlinks.sh
diff --git a/tests/issue1726_darcs_always-boring.sh b/tests/issue1726_darcs_always-boring.sh
diff --git a/tests/issue1727_move_current_directory.sh b/tests/issue1727_move_current_directory.sh
diff --git a/tests/issue1737-move_args.sh b/tests/issue1737-move_args.sh
diff --git a/tests/issue1739-escape-multibyte-chars-correctly.sh b/tests/issue1739-escape-multibyte-chars-correctly.sh
diff --git a/tests/issue1740-mv-dir.sh b/tests/issue1740-mv-dir.sh
diff --git a/tests/issue174_obliterate_before_a_tag.sh b/tests/issue174_obliterate_before_a_tag.sh
diff --git a/tests/issue1756_moves_index.sh b/tests/issue1756_moves_index.sh
diff --git a/tests/issue1763-pull-fails-on-non-ascii-filenames.sh b/tests/issue1763-pull-fails-on-non-ascii-filenames.sh
diff --git a/tests/issue1819-pull-dont-allow-conflicts.sh b/tests/issue1819-pull-dont-allow-conflicts.sh
diff --git a/tests/issue1825-remove-pending.sh b/tests/issue1825-remove-pending.sh
diff --git a/tests/issue183_mv_order.sh b/tests/issue183_mv_order.sh
diff --git a/tests/issue1845-paths-working-copy.sh b/tests/issue1845-paths-working-copy.sh
diff --git a/tests/issue1857-pristine-conversion.sh b/tests/issue1857-pristine-conversion.sh
diff --git a/tests/issue1860-incomplete-pristine.sh b/tests/issue1860-incomplete-pristine.sh
diff --git a/tests/issue1875-honor-no-set-default.sh b/tests/issue1875-honor-no-set-default.sh
diff --git a/tests/issue1877_noisy_xml_output.sh b/tests/issue1877_noisy_xml_output.sh
diff --git a/tests/issue1879-same-patchinfo-uncommon.sh b/tests/issue1879-same-patchinfo-uncommon.sh
diff --git a/tests/issue189-external-merge-move.sh b/tests/issue189-external-merge-move.sh
diff --git a/tests/issue1898-set-default-notification.sh b/tests/issue1898-set-default-notification.sh
diff --git a/tests/issue1909-unrecord-O-misses-tag.sh b/tests/issue1909-unrecord-O-misses-tag.sh
diff --git a/tests/issue1913-diffing.sh b/tests/issue1913-diffing.sh
diff --git a/tests/issue1922-obliterate-o-context.sh b/tests/issue1922-obliterate-o-context.sh
diff --git a/tests/issue1928-file-dir-replace.sh b/tests/issue1928-file-dir-replace.sh
diff --git a/tests/issue1932-colon-breaks-add.sh b/tests/issue1932-colon-breaks-add.sh
diff --git a/tests/issue1951-add-outside-repo.sh b/tests/issue1951-add-outside-repo.sh
diff --git a/tests/issue1959-unwritable-darcsdir.sh b/tests/issue1959-unwritable-darcsdir.sh
diff --git a/tests/issue1978.sh b/tests/issue1978.sh
diff --git a/tests/issue1987.sh b/tests/issue1987.sh
diff --git a/tests/issue2012_send_output_no_address.sh b/tests/issue2012_send_output_no_address.sh
diff --git a/tests/issue2013_send_to_context.sh b/tests/issue2013_send_to_context.sh
diff --git a/tests/issue2035-malicious-subpath.sh b/tests/issue2035-malicious-subpath.sh
diff --git a/tests/issue2041_dont_add_symlinks.sh b/tests/issue2041_dont_add_symlinks.sh
diff --git a/tests/issue2047_duplicate_conflictor_recommute_fail.sh b/tests/issue2047_duplicate_conflictor_recommute_fail.sh
diff --git a/tests/issue2049-dir-case-change.sh b/tests/issue2049-dir-case-change.sh
diff --git a/tests/issue2049-file-in-boring-dir.sh b/tests/issue2049-file-in-boring-dir.sh
diff --git a/tests/issue2066_add_and_remove.sh b/tests/issue2066_add_and_remove.sh
diff --git a/tests/issue2074.sh b/tests/issue2074.sh
diff --git a/tests/issue2076-move_into_dir.sh b/tests/issue2076-move_into_dir.sh
diff --git a/tests/issue2086-index-permissions.sh b/tests/issue2086-index-permissions.sh
diff --git a/tests/issue2125-always-warn-forced-replace.sh b/tests/issue2125-always-warn-forced-replace.sh
diff --git a/tests/issue2136-log_created_as_for_multiple_files.sh b/tests/issue2136-log_created_as_for_multiple_files.sh
diff --git a/tests/issue2153-allow-skipping-backwards-through-depended_upon-patches.sh b/tests/issue2153-allow-skipping-backwards-through-depended_upon-patches.sh
diff --git a/tests/issue2200-darcs-replace-no-paths.sh b/tests/issue2200-darcs-replace-no-paths.sh
diff --git a/tests/issue2204-send-mail.sh b/tests/issue2204-send-mail.sh
diff --git a/tests/issue2208-replace-fails-with-resolving-unrecorded-change.sh b/tests/issue2208-replace-fails-with-resolving-unrecorded-change.sh
diff --git a/tests/issue2209-look_for_replaces.sh b/tests/issue2209-look_for_replaces.sh
diff --git a/tests/issue2212-add-changes-pending-for-other-files.sh b/tests/issue2212-add-changes-pending-for-other-files.sh
diff --git a/tests/issue2225-obliterate-not-in.sh b/tests/issue2225-obliterate-not-in.sh
diff --git a/tests/issue2227-rebase-amend-record.sh b/tests/issue2227-rebase-amend-record.sh
diff --git a/tests/issue2243-unknown-patch-annotating-empty-first-line.sh b/tests/issue2243-unknown-patch-annotating-empty-first-line.sh
diff --git a/tests/issue2248-rebase-zero-suspended.sh b/tests/issue2248-rebase-zero-suspended.sh
diff --git a/tests/issue2257-impossible-obliterate-subset.sh b/tests/issue2257-impossible-obliterate-subset.sh
diff --git a/tests/issue2262-display_of_meta_data.sh b/tests/issue2262-display_of_meta_data.sh
diff --git a/tests/issue2270-log-interactive-only-to-files.sh b/tests/issue2270-log-interactive-only-to-files.sh
diff --git a/tests/issue2271-disable-patch-index.sh b/tests/issue2271-disable-patch-index.sh
diff --git a/tests/issue2275_follows-symlinks.sh b/tests/issue2275_follows-symlinks.sh
diff --git a/tests/issue2286-metadata-encoding.sh b/tests/issue2286-metadata-encoding.sh
diff --git a/tests/issue2287_obliterate_overwrite.sh b/tests/issue2287_obliterate_overwrite.sh
diff --git a/tests/issue2293-laziness.sh b/tests/issue2293-laziness.sh
diff --git a/tests/issue2311_posthook_for_get_should_run_in_created_repo.sh b/tests/issue2311_posthook_for_get_should_run_in_created_repo.sh
diff --git a/tests/issue2312_posthooks_for_record_and_amend-record_should_receive_DARCS_PATCHES.sh b/tests/issue2312_posthooks_for_record_and_amend-record_should_receive_DARCS_PATCHES.sh
diff --git a/tests/issue2313-trailing-newlines-stack-overflow.sh b/tests/issue2313-trailing-newlines-stack-overflow.sh
diff --git a/tests/issue2333.sh b/tests/issue2333.sh
diff --git a/tests/issue2343.sh b/tests/issue2343.sh
diff --git a/tests/issue2365-whatsnew-fails-get-no-working-dir.sh b/tests/issue2365-whatsnew-fails-get-no-working-dir.sh
diff --git a/tests/issue2380-rename-to-deleted-file.sh b/tests/issue2380-rename-to-deleted-file.sh
diff --git a/tests/issue2382-mv-dir-to-file-confuses-darcs.sh b/tests/issue2382-mv-dir-to-file-confuses-darcs.sh
diff --git a/tests/issue2432-pull-reorder-commute.sh b/tests/issue2432-pull-reorder-commute.sh
diff --git a/tests/issue2479-mv-list-files.sh b/tests/issue2479-mv-list-files.sh
diff --git a/tests/issue2480-display-unicode-in-patch-content.sh b/tests/issue2480-display-unicode-in-patch-content.sh
diff --git a/tests/issue2494-output-of-record-with-file-arguments.sh b/tests/issue2494-output-of-record-with-file-arguments.sh
diff --git a/tests/issue2496-output-of-whatsnew-with-file-arguments.sh b/tests/issue2496-output-of-whatsnew-with-file-arguments.sh
diff --git a/tests/issue2512-multiple-authors-clobbered-in-global-conf.sh b/tests/issue2512-multiple-authors-clobbered-in-global-conf.sh
diff --git a/tests/issue2526-whatsnew-boring.sh b/tests/issue2526-whatsnew-boring.sh
diff --git a/tests/issue2548-inconsistent-pending.sh b/tests/issue2548-inconsistent-pending.sh
diff --git a/tests/issue2567-darcs-whatsnew-unified.sh b/tests/issue2567-darcs-whatsnew-unified.sh
diff --git a/tests/issue257.sh b/tests/issue257.sh
diff --git a/tests/issue2592-pending-look-for.sh b/tests/issue2592-pending-look-for.sh
diff --git a/tests/issue2594-darcs-show-index-breaks-replace.sh b/tests/issue2594-darcs-show-index-breaks-replace.sh
diff --git a/tests/issue2603-clone-repo-with-unresolved-conflicts.sh b/tests/issue2603-clone-repo-with-unresolved-conflicts.sh
diff --git a/tests/issue2605-duplicates.sh b/tests/issue2605-duplicates.sh
diff --git a/tests/issue2618-ask-deps-too-many.sh b/tests/issue2618-ask-deps-too-many.sh
diff --git a/tests/issue2634-rebase-conflicted-patches.sh b/tests/issue2634-rebase-conflicted-patches.sh
diff --git a/tests/issue2648_darcs_convert_import_double_encodes_cyrillic.sh b/tests/issue2648_darcs_convert_import_double_encodes_cyrillic.sh
diff --git a/tests/issue2659-show-dependencies.sh b/tests/issue2659-show-dependencies.sh
diff --git a/tests/issue2668-create-directory-permission.sh b/tests/issue2668-create-directory-permission.sh
diff --git a/tests/issue2682.sh b/tests/issue2682.sh
diff --git a/tests/issue2697-amend-unrecord.sh b/tests/issue2697-amend-unrecord.sh
diff --git a/tests/issue27.sh b/tests/issue27.sh
diff --git a/tests/issue2702-invalid-regex.sh b/tests/issue2702-invalid-regex.sh
diff --git a/tests/issue279_get_extra.sh b/tests/issue279_get_extra.sh
diff --git a/tests/issue381.sh b/tests/issue381.sh
diff --git a/tests/issue436.sh b/tests/issue436.sh
diff --git a/tests/issue458.sh b/tests/issue458.sh
diff --git a/tests/issue494-pending-sort.sh b/tests/issue494-pending-sort.sh
diff --git a/tests/issue525_amend_duplicates.sh b/tests/issue525_amend_duplicates.sh
diff --git a/tests/issue53.sh b/tests/issue53.sh
diff --git a/tests/issue538.sh b/tests/issue538.sh
diff --git a/tests/issue588.sh b/tests/issue588.sh
diff --git a/tests/issue595_get_permissions.sh b/tests/issue595_get_permissions.sh
diff --git a/tests/issue612_repo_not_writable.sh b/tests/issue612_repo_not_writable.sh
diff --git a/tests/issue68_broken_pipe.sh b/tests/issue68_broken_pipe.sh
diff --git a/tests/issue691.sh b/tests/issue691.sh
diff --git a/tests/issue701.sh b/tests/issue701.sh
diff --git a/tests/issue706.sh b/tests/issue706.sh
diff --git a/tests/issue709_pending_look-for-adds.sh b/tests/issue709_pending_look-for-adds.sh
diff --git a/tests/issue70_setpref.sh b/tests/issue70_setpref.sh
diff --git a/tests/issue761-fail-early-bad-pull-match.sh b/tests/issue761-fail-early-bad-pull-match.sh
diff --git a/tests/issue803.sh b/tests/issue803.sh
diff --git a/tests/issue844_gzip_crc.sh b/tests/issue844_gzip_crc.sh
diff --git a/tests/issue942_push_apply_prehook.sh b/tests/issue942_push_apply_prehook.sh
diff --git a/tests/latin9-input.sh b/tests/latin9-input.sh
diff --git a/tests/lazy-optimize-reorder.sh b/tests/lazy-optimize-reorder.sh
diff --git a/tests/legacy-inverted.sh b/tests/legacy-inverted.sh
diff --git a/tests/list-options.sh b/tests/list-options.sh
diff --git a/tests/log-duplicate.sh b/tests/log-duplicate.sh
diff --git a/tests/log.sh b/tests/log.sh
diff --git a/tests/log_send_context.sh b/tests/log_send_context.sh
diff --git a/tests/look_for_add.sh b/tests/look_for_add.sh
diff --git a/tests/look_for_moves.sh b/tests/look_for_moves.sh
diff --git a/tests/look_for_moves_and_replaces.sh b/tests/look_for_moves_and_replaces.sh
diff --git a/tests/look_for_moves_with_args.sh b/tests/look_for_moves_with_args.sh
diff --git a/tests/look_for_replaces1.sh b/tests/look_for_replaces1.sh
diff --git a/tests/mark-conflicts.sh b/tests/mark-conflicts.sh
diff --git a/tests/match-date.sh b/tests/match-date.sh
diff --git a/tests/match.sh b/tests/match.sh
diff --git a/tests/merge_three_patches.sh b/tests/merge_three_patches.sh
diff --git a/tests/mergeresolved.sh b/tests/mergeresolved.sh
diff --git a/tests/merging_newlines.sh b/tests/merging_newlines.sh
diff --git a/tests/mutex-option-precedence.sh b/tests/mutex-option-precedence.sh
diff --git a/tests/mv.sh b/tests/mv.sh
diff --git a/tests/mv_and_remove_tests.sh b/tests/mv_and_remove_tests.sh
diff --git a/tests/network/clone-http-packed-detect.sh b/tests/network/clone-http-packed-detect.sh
diff --git a/tests/network/clone-http-packed.sh b/tests/network/clone-http-packed.sh
diff --git a/tests/network/clone-http.sh b/tests/network/clone-http.sh
diff --git a/tests/network/clone.sh b/tests/network/clone.sh
diff --git a/tests/network/external.sh b/tests/network/external.sh
diff --git a/tests/network/issue1503_prefer_local_caches_to_remote_one.sh b/tests/network/issue1503_prefer_local_caches_to_remote_one.sh
diff --git a/tests/network/issue1599-automatically-expire-unused-caches.sh b/tests/network/issue1599-automatically-expire-unused-caches.sh
diff --git a/tests/network/issue1923-cache-warning.sh b/tests/network/issue1923-cache-warning.sh
diff --git a/tests/network/issue1932-remote.sh b/tests/network/issue1932-remote.sh
diff --git a/tests/network/issue2090-transfer-mode.sh b/tests/network/issue2090-transfer-mode.sh
diff --git a/tests/network/issue2545_command-execution-via-ssh-uri-local.sh b/tests/network/issue2545_command-execution-via-ssh-uri-local.sh
diff --git a/tests/network/issue2545_command-execution-via-ssh-uri.sh b/tests/network/issue2545_command-execution-via-ssh-uri.sh
diff --git a/tests/network/issue2608-clone-http-packed-outdated.sh b/tests/network/issue2608-clone-http-packed-outdated.sh
diff --git a/tests/network/lazy-clone.sh b/tests/network/lazy-clone.sh
diff --git a/tests/network/log.sh b/tests/network/log.sh
diff --git a/tests/network/show_tags-remote.sh b/tests/network/show_tags-remote.sh
diff --git a/tests/network/ssh.sh b/tests/network/ssh.sh
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Just "\nContext:\n\n\n[cabal file: add hie flag\nBen Franksen <[email protected]>20240510175237\n Ignore-this: 1d42ad05750e08d23ec0f6a387c08ceb051de31ec48a97826573f14a56e3a0ae16584ed3577f82c0\n] \n\n[ci: upgrade actions/cache, fix cache/save warnings\nBen Franksen <[email protected]>20240510155801\n Ignore-this: 1b2f726a24693810ec0fe995af9a0be968ca86728cc26758ca9582516968397ca1d3b4be1c478a8b\n] \n\n[resolve issue2718: avoid using conflictedPaths to detect whether we have conflicts\nBen Franksen <[email protected]>20240510130208\n Ignore-this: 6aeca7588b2418053dd27039d0f2bcbecbee965e2e8a270f24f89b427fe787f9d811ef1eaf1a61bb\n \n This adds an explicit test named haveConflicts, which looks at the \"sum\" of\n the mangled and unmangled conflicts. This is cleaner because in principle\n (albeit not in practice) there could be conflicts that do not involve any\n file paths. Consequently, the warning message for conflicts is now separate\n from the listing of the affected paths.\n] \n\n[two optimizations in remove command\nBen Franksen <[email protected]>20240510071822\n Ignore-this: b4d3049af67f9824469de5692e6337f5dd0586e921b973632e74c9d180287f8d30460777119bc81f\n \n Frst, avoid duplicate call to readPristineAndPending by passing the pristine\n tree to makeRemovePatch. Also, use a path filter before expanding the tree,\n to avoid expansion of irrelevant parts of the tree.\n] \n\n[ci: remove ghc-8.2.2 from build matrix\nBen Franksen <[email protected]>20240509190406\n Ignore-this: f0a8e2f11701fc743212fda56d6106d5364cefead256b63d06d363e787b409a74318611cf1ce06da\n \n Building the dependencies now fails on macos-13 with ghc-8.2.2. We already\n excluded it for the other systems due to various build problems, so can as\n well remove it entirely.\n] \n\n[resolve issue2714: cannot remove recursively\nBen Franksen <[email protected]>20240506183723\n Ignore-this: fcab2e01d6fe9dc16facda2a569eeb4454c3c1208cdcd31bb9c630334290de1de6dba8d5611666d9\n] \n\n[put back the set-default hint\nGanesh Sittampalam <[email protected]>20240309154509\n Ignore-this: 7f52711f8776994dcb902a5d23741d6c6af6f3113c1ec30a2691348235d16cd81689a21eff8d334d\n \n This rolls back patch 8c1131290443248d423cabe0b5566f840e6cb3b3\n] \n\n[Add a --ghcflags/-g option to the test suite\nGanesh Sittampalam <[email protected]>20240309145422\n Ignore-this: aba41611871b0ee986beee2e1bd6fb9af6690bf7315737fdb1c166222685ee8be703003d492eb010\n \n This allows arbitrary GHC flags to be passed on to the ghc\n invocations used to build helper exes in various test scripts.\n \n For example this allows -dynamic to be passed on systems with\n shared libraries.\n \n Based on a patch by Vekhir <[email protected]>\n] \n\n[Darcs.UI.External: fix warnings about head\nGanesh Sittampalam <[email protected]>20240225215257\n Ignore-this: 35ed1b4cd0f4c1af70133228547dac7fce5067a1482cbe6810c515f82389d70cb1f2bed0a7a32fc9\n] \n\n[Darcs.UI.Commands.ShowAuthors: fix warnings about head\nGanesh Sittampalam <[email protected]>20240225215214\n Ignore-this: ee64bb835284ac05403ea170915e8ed2191de27042e69edea61f5743bd752ea14e44082f54d90f9a\n] \n\n[use headErr/tailErr from safe for several head/tails\nGanesh Sittampalam <[email protected]>20240225215204\n Ignore-this: bb7a9c0ef437f841d13a7eb2a0a24abcf5ee4d26a2856feac2966a4f89a52a5b20560bea920fbc42\n \n They aren't trivial to fix in a concise way, and safe\n is generally a useful package to have around anyway.\n] \n\n[Darcs.Test.Patch.FileUUIDModel: fix warning about head/tail\nGanesh Sittampalam <[email protected]>20240225215135\n Ignore-this: 740956f48bd3127b4f77c0c7350b8d229e0fd7be3bda48932a61341169cc976d6e7ed3dedc7cad11\n] \n\n[Darcs.UI.Commands.Record: fix warning about head\nGanesh Sittampalam <[email protected]>20240225205552\n Ignore-this: e288796d05da69107f281ccd311e1980cfc7d71aaab72b3c2ab2619c0f1ceaff76a497ae37705689\n] \n\n[Darcs.UI.Commands.Convert.Import: fix warning about head\nGanesh Sittampalam <[email protected]>20240225205524\n Ignore-this: a8c51b94ff04c6bed7959f43c3d518d6171048755646fd1146a7996ac6d5c5013db900b51ff29504\n] \n\n[Darcs.UI.Commands.Convert.Export: fix warnings about tail\nGanesh Sittampalam <[email protected]>20240225204214\n Ignore-this: a49d956016082487081f71fcace360f65cb92ad17e10e195651821d6e009b70b9d01b49a2b0c8708\n] \n\n[add some tests for Darcs.UI.Commands.Convert.Export.patchAuthor\nGanesh Sittampalam <[email protected]>20240225204119\n Ignore-this: 4a3a731c86732c64a27b9e9719950e01a94ef320b37259113c693e75080283806a23835c423e40b9\n] \n\n[darcs.hs: fix warnings about head/tail\nGanesh Sittampalam <[email protected]>20240225201516\n Ignore-this: 8f6fec34b8e77474a3b1ee5e252fb08fe8439c57a4a0ad35df64c06fe15df18f83c82855d8435e15\n] \n\n[Darcs.Patch.Info: fix warning about head\nGanesh Sittampalam <[email protected]>20240225195147\n Ignore-this: f50bcf1a170c6c8941c688021e20d1eee24e59b2afe7a5f01488c9c4f2cb92d58aed586f146a0a98\n] \n\n[Darcs.Util.Diff.Patience: fix warning about head\nGanesh Sittampalam <[email protected]>20240225194009\n Ignore-this: ccfaccc22725d81839f5caf605742eb7f3ef916572fdd7a53bcc7f7fa837ef9d71729e7c71d4503\n] \n\n[Darcs.Patch.Annotate: fix warning about head\nGanesh Sittampalam <[email protected]>20240225182503\n Ignore-this: 4c48b8aadee71311e2a01f5b53a678e07f53339d98e843ebc01ebd381163fe0a9d7f3721c2c5dc58\n] \n\n[bump version to 2.19.1\nGanesh Sittampalam <[email protected]>20240225175930\n Ignore-this: b8e8df00de306f7de2363d1805c152be15cc5b5ab99a57be8f9db19bb8552d0d25a196eeb2dc20c4\n] \n\n[TAG 2.18.1\nGanesh Sittampalam <[email protected]>20240225173219\n Ignore-this: dc3a92eafcab9d4fa9f53b1811d4c99d330615a8c202bff1b77f44d551d21684eee81e96c69be62b\n] \n"
		Just "\nContext:\n\n\n[add docs to configureHttpConnectionManager\nBen Franksen <[email protected]>20240519110146\n Ignore-this: ec69432373410c479f90ddda39b98a25a754db4d9e14055197cb47cfde85596faf2026e34f8fb11a\n] \n\n[add missing constraints data-default-class\nBen Franksen <[email protected]>20240519102829\n Ignore-this: 9d3f5afdeea6274f2532c2aa7fa407461bcddb3516a47a9fccb069500275e587d5cc252f41f6b96b\n] \n\n[Fix missing import in D.R.PatchIndex\nGanesh Sittampalam <[email protected]>20240513100533\n Ignore-this: bea59b7dfbd7e591a57f4bfcc7983003f79db4b4fe41f6072d904e9947a38d5936e75c9cdec0df86\n \n GHC 9.10 complains about it, not sure why earlier\n versions don't.\n] \n\n[ci: run tests with latest supported ghc version\nBen Franksen <[email protected]>20240517115615\n Ignore-this: 574d1033079aa6d6f5f42739ff36e353baf9b5503134f9b0cff839a02a64e101a778781f401661dc\n] \n\n[adapt supported ghc versions in README.md\nBen Franksen <[email protected]>20240517113218\n Ignore-this: c4e2e475e9c439bf0b240fd5dfffc6f57b43b94ecb57329e2686286b47f214a562150f0b336fce27\n] \n\n[ci: add ghc-9.8.2 to build matrix\nBen Franksen <[email protected]>20240517113141\n Ignore-this: a3103d91ec762a45b0e5b8a2a4f317d4358c58c0a94420f43784c623050af0381cdb9dc65a87bbc7\n] \n\n[resolve issue2715: hub.darcs.net does not support \"Extended Main Secret\"\nBen Franksen <[email protected]>20240515142402\n Ignore-this: 60c6b240cd1563fe7b3fc83845610e2c4d2ec00a6d5a4ada2e53e9fff4ff1022780a3dfa64d31a3e\n \n We use a new addition to crypton-connection in order to change the default\n setting back to old (tls < 2.0) default. For ghc < 8.8 crypton-connection\n is not available, so instead we constrain tls as before.\n] \n\n[support time 1.14\nGanesh Sittampalam <[email protected]>20240513000056\n Ignore-this: 929d96355713e762a5e77549597b6bd816992f93af1ef7125cdcf9caa396f6f5d82b2a8d71ff51e8\n \n This currently needs --allow-newer to use\n] \n\n[support QuickCheck 2.15\nGanesh Sittampalam <[email protected]>20240513000037\n Ignore-this: f078dc88530d2fdc51610fcadca12d0b355ae5c6594e76643f1592ccd329b5a8c817374f0522e0cc\n \n This currently needs --allow-newer to use\n] \n\n[support network 3.2\nGanesh Sittampalam <[email protected]>20240512234608\n Ignore-this: e50507030aecbb0cb90d369f331765cde093c746c257d6a301ea0d06ba91353b8d7aff9369e52bd3\n] \n\n[Resolve conflict in version bump from 2.18 branch\nGanesh Sittampalam <[email protected]>20240324221309\n Ignore-this: d035acfcb3339c22e37a8b4bc8f662258886e1f5ad786cd87d08edf9624cb3888606bf38d8177d26\n] \n\n[TAG 2.18.2\nGanesh Sittampalam <[email protected]>20240324205714\n Ignore-this: d03c480e509ce62eacaf0f1ad40f0cb7821163cac313d5ee4c977e7f77f9ec020b9e61214ddafe49\n] \n\n[bump version to 2.18.2\nGanesh Sittampalam <[email protected]>20240324205701\n Ignore-this: dd7bfdf697e6bc700288ee4a9406ed5d76e7ee049bc13a483c9ca3321903620c775e6fc133a12608\n] \n\n[CHANGELOG for 2.18.2\nGanesh Sittampalam <[email protected]>20240324205626\n Ignore-this: a7ea5d6b7ff3712201eb93651cdbf8653872da99839f527a6a6aa4a6f685b0707e867484ba805a57\n] \n\n[ci: upgrade actions/cache, fix cache/save warnings\nBen Franksen <[email protected]>20240510155801\n Ignore-this: 1b2f726a24693810ec0fe995af9a0be968ca86728cc26758ca9582516968397ca1d3b4be1c478a8b\n] \n\n[resolve issue2718: avoid using conflictedPaths to detect whether we have conflicts\nBen Franksen <[email protected]>20240510130208\n Ignore-this: 6aeca7588b2418053dd27039d0f2bcbecbee965e2e8a270f24f89b427fe787f9d811ef1eaf1a61bb\n \n This adds an explicit test named haveConflicts, which looks at the \"sum\" of\n the mangled and unmangled conflicts. This is cleaner because in principle\n (albeit not in practice) there could be conflicts that do not involve any\n file paths. Consequently, the warning message for conflicts is now separate\n from the listing of the affected paths.\n] \n\n[two optimizations in remove command\nBen Franksen <[email protected]>20240510071822\n Ignore-this: b4d3049af67f9824469de5692e6337f5dd0586e921b973632e74c9d180287f8d30460777119bc81f\n \n Frst, avoid duplicate call to readPristineAndPending by passing the pristine\n tree to makeRemovePatch. Also, use a path filter before expanding the tree,\n to avoid expansion of irrelevant parts of the tree.\n] \n\n[ci: remove ghc-8.2.2 from build matrix\nBen Franksen <[email protected]>20240509190406\n Ignore-this: f0a8e2f11701fc743212fda56d6106d5364cefead256b63d06d363e787b409a74318611cf1ce06da\n \n Building the dependencies now fails on macos-13 with ghc-8.2.2. We already\n excluded it for the other systems due to various build problems, so can as\n well remove it entirely.\n] \n\n[resolve issue2714: cannot remove recursively\nBen Franksen <[email protected]>20240506183723\n Ignore-this: fcab2e01d6fe9dc16facda2a569eeb4454c3c1208cdcd31bb9c630334290de1de6dba8d5611666d9\n] \n\n[put back the set-default hint\nGanesh Sittampalam <[email protected]>20240309154509\n Ignore-this: 7f52711f8776994dcb902a5d23741d6c6af6f3113c1ec30a2691348235d16cd81689a21eff8d334d\n \n This rolls back patch 8c1131290443248d423cabe0b5566f840e6cb3b3\n] \n\n[Add a --ghcflags/-g option to the test suite\nGanesh Sittampalam <[email protected]>20240309145422\n Ignore-this: aba41611871b0ee986beee2e1bd6fb9af6690bf7315737fdb1c166222685ee8be703003d492eb010\n \n This allows arbitrary GHC flags to be passed on to the ghc\n invocations used to build helper exes in various test scripts.\n \n For example this allows -dynamic to be passed on systems with\n shared libraries.\n \n Based on a patch by Vekhir <[email protected]>\n] \n\n[Darcs.UI.External: fix warnings about head\nGanesh Sittampalam <[email protected]>20240225215257\n Ignore-this: 35ed1b4cd0f4c1af70133228547dac7fce5067a1482cbe6810c515f82389d70cb1f2bed0a7a32fc9\n] \n\n[Darcs.UI.Commands.ShowAuthors: fix warnings about head\nGanesh Sittampalam <[email protected]>20240225215214\n Ignore-this: ee64bb835284ac05403ea170915e8ed2191de27042e69edea61f5743bd752ea14e44082f54d90f9a\n] \n\n[use headErr/tailErr from safe for several head/tails\nGanesh Sittampalam <[email protected]>20240225215204\n Ignore-this: bb7a9c0ef437f841d13a7eb2a0a24abcf5ee4d26a2856feac2966a4f89a52a5b20560bea920fbc42\n \n They aren't trivial to fix in a concise way, and safe\n is generally a useful package to have around anyway.\n] \n\n[Darcs.Test.Patch.FileUUIDModel: fix warning about head/tail\nGanesh Sittampalam <[email protected]>20240225215135\n Ignore-this: 740956f48bd3127b4f77c0c7350b8d229e0fd7be3bda48932a61341169cc976d6e7ed3dedc7cad11\n] \n\n[Darcs.UI.Commands.Record: fix warning about head\nGanesh Sittampalam <[email protected]>20240225205552\n Ignore-this: e288796d05da69107f281ccd311e1980cfc7d71aaab72b3c2ab2619c0f1ceaff76a497ae37705689\n] \n\n[Darcs.UI.Commands.Convert.Import: fix warning about head\nGanesh Sittampalam <[email protected]>20240225205524\n Ignore-this: a8c51b94ff04c6bed7959f43c3d518d6171048755646fd1146a7996ac6d5c5013db900b51ff29504\n] \n\n[Darcs.UI.Commands.Convert.Export: fix warnings about tail\nGanesh Sittampalam <[email protected]>20240225204214\n Ignore-this: a49d956016082487081f71fcace360f65cb92ad17e10e195651821d6e009b70b9d01b49a2b0c8708\n] \n\n[add some tests for Darcs.UI.Commands.Convert.Export.patchAuthor\nGanesh Sittampalam <[email protected]>20240225204119\n Ignore-this: 4a3a731c86732c64a27b9e9719950e01a94ef320b37259113c693e75080283806a23835c423e40b9\n] \n\n[darcs.hs: fix warnings about head/tail\nGanesh Sittampalam <[email protected]>20240225201516\n Ignore-this: 8f6fec34b8e77474a3b1ee5e252fb08fe8439c57a4a0ad35df64c06fe15df18f83c82855d8435e15\n] \n\n[Darcs.Patch.Info: fix warning about head\nGanesh Sittampalam <[email protected]>20240225195147\n Ignore-this: f50bcf1a170c6c8941c688021e20d1eee24e59b2afe7a5f01488c9c4f2cb92d58aed586f146a0a98\n] \n\n[Darcs.Util.Diff.Patience: fix warning about head\nGanesh Sittampalam <[email protected]>20240225194009\n Ignore-this: ccfaccc22725d81839f5caf605742eb7f3ef916572fdd7a53bcc7f7fa837ef9d71729e7c71d4503\n] \n\n[Darcs.Patch.Annotate: fix warning about head\nGanesh Sittampalam <[email protected]>20240225182503\n Ignore-this: 4c48b8aadee71311e2a01f5b53a678e07f53339d98e843ebc01ebd381163fe0a9d7f3721c2c5dc58\n] \n\n[bump version to 2.19.1\nGanesh Sittampalam <[email protected]>20240225175930\n Ignore-this: b8e8df00de306f7de2363d1805c152be15cc5b5ab99a57be8f9db19bb8552d0d25a196eeb2dc20c4\n] \n\n[TAG 2.18.1\nGanesh Sittampalam <[email protected]>**20240225173219\n Ignore-this: dc3a92eafcab9d4fa9f53b1811d4c99d330615a8c202bff1b77f44d551d21684eee81e96c69be62b\n] \n"