commit | a9f080e0895796a4a1854d23427eb61669a25231 | [log] [tgz] |
---|---|---|
author | Julian Foad <julianfoad@apache.org> | Tue Apr 20 19:49:07 2021 +0000 |
committer | Julian Foad <julianfoad@apache.org> | Tue Apr 20 19:49:07 2021 +0000 |
tree | aefd93090a0ae4d51bbdac8b8a63e98c6373f45a | |
parent | 1108d2cc039affebcbffaa42d107590fd4f2f9be [diff] |
For issue #4874 "Avoid foreign repository merge if repository UUIDs match" Automatically change the test's expectations from a warning to an error when Subversion 1.16 comes out. * subversion/tests/cmdline/merge_tests.py (merge_error_if_ambiguous_foreign_merge): Make expectations conditional on the Subversion client version. git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1889032 13f79535-47bb-0310-9956-ffa450edef68