From 4c9ca72910bac34e369eddb2a708d69405452ae6 Mon Sep 17 00:00:00 2001
From: dpmatthews <david.matthews@metoffice.gov.uk>
Date: Tue, 19 Jan 2021 17:53:28 +0000
Subject: [PATCH 1/2] Enable all tests

---
 t/fcm-conflicts/00-tree-add-add.t            |  1 -
 t/fcm-conflicts/02-tree-delete-edit.t        |  1 -
 t/fcm-conflicts/03-tree-delete-rename.t      |  1 -
 t/fcm-conflicts/05-tree-edit-rename.t        |  1 -
 t/fcm-conflicts/07-tree-rename-edit.t        |  1 -
 t/fcm-conflicts/08-tree-rename-rename-diff.t | 13 ++++++-------
 t/fcm-conflicts/09-tree-rename-rename-same.t |  1 -
 7 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/t/fcm-conflicts/00-tree-add-add.t b/t/fcm-conflicts/00-tree-add-add.t
index 99ed331a..46d72eae 100644
--- a/t/fcm-conflicts/00-tree-add-add.t
+++ b/t/fcm-conflicts/00-tree-add-add.t
@@ -22,7 +22,6 @@
 . $(dirname $0)/test_header
 #-------------------------------------------------------------------------------
 check_svn_version
-[[ $SVN_MINOR_VERSION == "1.10" ]] && skip_all "Tests not working with svn 1.10"
 tests 24
 #-------------------------------------------------------------------------------
 setup
diff --git a/t/fcm-conflicts/02-tree-delete-edit.t b/t/fcm-conflicts/02-tree-delete-edit.t
index d4564c0e..9db15072 100644
--- a/t/fcm-conflicts/02-tree-delete-edit.t
+++ b/t/fcm-conflicts/02-tree-delete-edit.t
@@ -22,7 +22,6 @@
 . $(dirname $0)/test_header
 #-------------------------------------------------------------------------------
 check_svn_version
-[[ $SVN_MINOR_VERSION == "1.10" ]] && skip_all "Tests not working with svn 1.10"
 tests 18
 #-------------------------------------------------------------------------------
 setup
diff --git a/t/fcm-conflicts/03-tree-delete-rename.t b/t/fcm-conflicts/03-tree-delete-rename.t
index b735ea59..9b0a096f 100644
--- a/t/fcm-conflicts/03-tree-delete-rename.t
+++ b/t/fcm-conflicts/03-tree-delete-rename.t
@@ -22,7 +22,6 @@
 . $(dirname $0)/test_header
 #-------------------------------------------------------------------------------
 check_svn_version
-[[ $SVN_MINOR_VERSION == "1.10" ]] && skip_all "Tests not working with svn 1.10"
 tests 15
 #-------------------------------------------------------------------------------
 setup
diff --git a/t/fcm-conflicts/05-tree-edit-rename.t b/t/fcm-conflicts/05-tree-edit-rename.t
index c12fcb24..240bfe24 100644
--- a/t/fcm-conflicts/05-tree-edit-rename.t
+++ b/t/fcm-conflicts/05-tree-edit-rename.t
@@ -22,7 +22,6 @@
 . $(dirname $0)/test_header
 #-------------------------------------------------------------------------------
 check_svn_version
-[[ $SVN_MINOR_VERSION == "1.10" ]] && skip_all "Tests not working with svn 1.10"
 tests 24
 #-------------------------------------------------------------------------------
 setup
diff --git a/t/fcm-conflicts/07-tree-rename-edit.t b/t/fcm-conflicts/07-tree-rename-edit.t
index d96f7a20..42c91f80 100644
--- a/t/fcm-conflicts/07-tree-rename-edit.t
+++ b/t/fcm-conflicts/07-tree-rename-edit.t
@@ -22,7 +22,6 @@
 . $(dirname $0)/test_header
 #-------------------------------------------------------------------------------
 check_svn_version
-[[ $SVN_MINOR_VERSION == "1.10" ]] && skip_all "Tests not working with svn 1.10"
 tests 18
 #-------------------------------------------------------------------------------
 setup
diff --git a/t/fcm-conflicts/08-tree-rename-rename-diff.t b/t/fcm-conflicts/08-tree-rename-rename-diff.t
index 2667fc44..c05b10b4 100644
--- a/t/fcm-conflicts/08-tree-rename-rename-diff.t
+++ b/t/fcm-conflicts/08-tree-rename-rename-diff.t
@@ -22,7 +22,6 @@
 . $(dirname $0)/test_header
 #-------------------------------------------------------------------------------
 check_svn_version
-[[ $SVN_MINOR_VERSION == "1.10" ]] && skip_all "Tests not working with svn 1.10"
 tests 18
 #-------------------------------------------------------------------------------
 setup
@@ -33,7 +32,7 @@ init_branch_wc ren_ren $REPOS_URL
 export FCM_GRAPHIC_MERGE=fcm-dummy-diff
 cd $TEST_DIR/wc
 #-------------------------------------------------------------------------------
-# Tests fcm conflicts: rename, rename, diff rename, discard local
+# Tests fcm conflicts: rename, diff rename, discard local
 TEST_KEY=$TEST_KEY_BASE-discard
 svn switch -q $ROOT_URL/branches/dev/Share/ctrl
 svn rename -q pro/hello.pro pro/hello.pro.renamed-local
@@ -74,7 +73,7 @@ Resolved conflicted state of 'pro/hello.pro'
 __OUT__
 file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
 #-------------------------------------------------------------------------------
-# Tests fcm conflicts: rename, rename, diff rename, discard local (status)
+# Tests fcm conflicts: rename, diff rename, discard local (status)
 TEST_KEY=$TEST_KEY_BASE-discard-status
 run_pass "$TEST_KEY" svn status --config-dir=$TEST_DIR/.subversion/
 file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
@@ -84,7 +83,7 @@ A  +    pro/hello.pro.renamed-merge
 __OUT__
 file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
 #-------------------------------------------------------------------------------
-# Tests fcm conflicts: rename, rename, diff rename, discard local (cat)
+# Tests fcm conflicts: rename, diff rename, discard local (cat)
 TEST_KEY=$TEST_KEY_BASE-discard-cat
 run_pass "$TEST_KEY" cat pro/hello.pro.renamed-merge
 file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
@@ -100,7 +99,7 @@ mkdir $TEST_DIR/wc
 svn checkout -q $ROOT_URL/branches/dev/Share/ctrl $TEST_DIR/wc
 cd $TEST_DIR/wc
 #-------------------------------------------------------------------------------
-# Tests fcm conflicts: rename, rename, diff rename, keep local
+# Tests fcm conflicts: rename, diff rename, keep local
 TEST_KEY=$TEST_KEY_BASE-keep
 fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ren >/dev/null
 run_pass "$TEST_KEY" fcm conflicts <<__IN__
@@ -126,7 +125,7 @@ Resolved conflicted state of 'pro/hello.pro'
 __OUT__
 file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
 #-------------------------------------------------------------------------------
-# Tests fcm conflicts: rename, rename, diff rename, keep local (status)
+# Tests fcm conflicts: rename, diff rename, keep local (status)
 TEST_KEY=$TEST_KEY_BASE-keep-status
 run_pass "$TEST_KEY" svn status --config-dir=$TEST_DIR/.subversion/
 file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
@@ -134,7 +133,7 @@ file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
 __OUT__
 file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
 #-------------------------------------------------------------------------------
-# Tests fcm conflicts: rename, rename, diff rename, keep local (cat)
+# Tests fcm conflicts: rename, diff rename, keep local (cat)
 TEST_KEY=$TEST_KEY_BASE-keep-cat
 run_pass "$TEST_KEY" cat pro/hello.pro.renamed-local
 file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
diff --git a/t/fcm-conflicts/09-tree-rename-rename-same.t b/t/fcm-conflicts/09-tree-rename-rename-same.t
index 8e4fde3a..e0702643 100644
--- a/t/fcm-conflicts/09-tree-rename-rename-same.t
+++ b/t/fcm-conflicts/09-tree-rename-rename-same.t
@@ -23,7 +23,6 @@
 . $(dirname $0)/test_header
 #-------------------------------------------------------------------------------
 check_svn_version
-[[ $SVN_MINOR_VERSION == "1.10" ]] && skip_all "Tests not working with svn 1.10"
 tests 27
 #-------------------------------------------------------------------------------
 setup

From 010d415fb402ca4ba432ef7c68f9005fecfaaec8 Mon Sep 17 00:00:00 2001
From: dpmatthews <david.matthews@metoffice.gov.uk>
Date: Tue, 16 Mar 2021 22:49:25 +0000
Subject: [PATCH 2/2] Fix remaining t/svn-conflicts tests to work with svn
 1.10.7 Use Trac 1.2 with Ubuntu 16.04 (1.4 not working)

---
 .github/workflows/tests.yaml                 |  3 ++-
 t/fcm-conflicts/00-tree-add-add.t            |  5 +++--
 t/fcm-conflicts/03-tree-delete-rename.t      |  5 +++--
 t/fcm-conflicts/05-tree-edit-rename.t        |  5 +++--
 t/fcm-conflicts/07-tree-rename-edit.t        | 10 ++++++----
 t/fcm-conflicts/08-tree-rename-rename-diff.t | 10 ++++++----
 t/fcm-conflicts/09-tree-rename-rename-same.t |  3 ++-
 7 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 75c97fbf..c9bbc11d 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -25,7 +25,8 @@ jobs:
             libdbd-sqlite3-perl \
             python-subversion libsvn-perl \
             s-nail
-          [[ ${{matrix.ubuntu}} != "ubuntu-20.04" ]] && sudo pip install 'trac' || true
+          [[ ${{matrix.ubuntu}} == "ubuntu-16.04" ]] && sudo pip install 'trac==1.2' || true
+          [[ ${{matrix.ubuntu}} == "ubuntu-18.04" ]] && sudo pip install 'trac' || true
           echo "#!/bin/bash" >"${PWD}/bin/gfortran"
           echo 'exec gfortran-9 "$@"' >>"${PWD}/bin/gfortran"
           chmod +x "${PWD}/bin/gfortran"
diff --git a/t/fcm-conflicts/00-tree-add-add.t b/t/fcm-conflicts/00-tree-add-add.t
index 46d72eae..8d2fc588 100644
--- a/t/fcm-conflicts/00-tree-add-add.t
+++ b/t/fcm-conflicts/00-tree-add-add.t
@@ -48,14 +48,15 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/add_add >/dev/null
 run_pass "$TEST_KEY" fcm conflicts <<__IN__
 n
 __IN__
-file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
+file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
 [info] new_file: in tree conflict.
 Locally: added.
 Externally: added.
 Answer (y) to keep the local file filename.
 Answer (n) to keep the external file filename.
 Keep the local version?
-Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'new_file'
+#IF SVN1.8/9 Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'new_file'
+#IF SVN1.10 Enter "y" or "n" (or just press <return> for "n") Tree conflict at 'new_file' marked as resolved.
 __OUT__
 file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
 #-------------------------------------------------------------------------------
diff --git a/t/fcm-conflicts/03-tree-delete-rename.t b/t/fcm-conflicts/03-tree-delete-rename.t
index 9b0a096f..5dbd7dc1 100644
--- a/t/fcm-conflicts/03-tree-delete-rename.t
+++ b/t/fcm-conflicts/03-tree-delete-rename.t
@@ -91,7 +91,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/del_ren >/dev/null
 run_pass "$TEST_KEY" fcm conflicts <<__IN__
 y
 __IN__
-file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
+file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
 [info] pro/hello.pro: in tree conflict.
 Locally: deleted.
 Externally: renamed to pro/hello.pro.renamed.
@@ -99,7 +99,8 @@ Answer (y) to accept the local delete.
 Answer (n) to accept the external rename.
 Keep the local version?
 Enter "y" or "n" (or just press <return> for "n") Reverted 'pro/hello.pro.renamed'
-Resolved conflicted state of 'pro/hello.pro'
+#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
+#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
 __OUT__
 file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
 #-------------------------------------------------------------------------------
diff --git a/t/fcm-conflicts/05-tree-edit-rename.t b/t/fcm-conflicts/05-tree-edit-rename.t
index 240bfe24..f4a4ccf4 100644
--- a/t/fcm-conflicts/05-tree-edit-rename.t
+++ b/t/fcm-conflicts/05-tree-edit-rename.t
@@ -124,7 +124,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ed_ren >/dev/null
 run_pass "$TEST_KEY" fcm conflicts <<__IN__
 y
 __IN__
-file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
+file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
 [info] pro/hello.pro: in tree conflict.
 Locally: edited.
 Externally: renamed to pro/hello.pro.renamed.
@@ -141,7 +141,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.working pr
   Merge contents (1)
   Merge contents (2)
 Reverted 'pro/hello.pro.renamed'
-Resolved conflicted state of 'pro/hello.pro'
+#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
+#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
 __OUT__
 file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
 #-------------------------------------------------------------------------------
diff --git a/t/fcm-conflicts/07-tree-rename-edit.t b/t/fcm-conflicts/07-tree-rename-edit.t
index 42c91f80..a2fb5452 100644
--- a/t/fcm-conflicts/07-tree-rename-edit.t
+++ b/t/fcm-conflicts/07-tree-rename-edit.t
@@ -50,7 +50,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ed >/dev/null
 run_pass "$TEST_KEY" fcm conflicts <<__IN__
 n
 __IN__
-file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
+file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
 [info] pro/hello.pro: in tree conflict.
 Locally: renamed to pro/hello.pro.renamed.
 Externally: edited.
@@ -67,7 +67,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.renamed.wo
   Merge contents (1)
 A         pro/hello.pro
 D         pro/hello.pro.renamed
-Resolved conflicted state of 'pro/hello.pro'
+#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
+#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
 __OUT__
 file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
 #-------------------------------------------------------------------------------
@@ -105,7 +106,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ed >/dev/null
 run_pass "$TEST_KEY" fcm conflicts <<__IN__
 y
 __IN__
-file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
+file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
 [info] pro/hello.pro: in tree conflict.
 Locally: renamed to pro/hello.pro.renamed.
 Externally: edited.
@@ -120,7 +121,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.renamed.wo
 2:2a
 3:3c
   Merge contents (1)
-Resolved conflicted state of 'pro/hello.pro'
+#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
+#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
 __OUT__
 file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
 #-------------------------------------------------------------------------------
diff --git a/t/fcm-conflicts/08-tree-rename-rename-diff.t b/t/fcm-conflicts/08-tree-rename-rename-diff.t
index c05b10b4..851fcb80 100644
--- a/t/fcm-conflicts/08-tree-rename-rename-diff.t
+++ b/t/fcm-conflicts/08-tree-rename-rename-diff.t
@@ -53,7 +53,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ren >/dev/null
 run_pass "$TEST_KEY" fcm conflicts <<__IN__
 n
 __IN__
-file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
+file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
 [info] pro/hello.pro: in tree conflict.
 Locally: renamed to pro/hello.pro.renamed-local.
 Externally: renamed to pro/hello.pro.renamed-merge.
@@ -69,7 +69,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.renamed-me
 3:3c
   Merge contents (1)
 D         pro/hello.pro.renamed-local
-Resolved conflicted state of 'pro/hello.pro'
+#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
+#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
 __OUT__
 file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
 #-------------------------------------------------------------------------------
@@ -105,7 +106,7 @@ fcm merge --non-interactive $ROOT_URL/branches/dev/Share/ren_ren >/dev/null
 run_pass "$TEST_KEY" fcm conflicts <<__IN__
 y
 __IN__
-file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
+file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
 [info] pro/hello.pro: in tree conflict.
 Locally: renamed to pro/hello.pro.renamed-local.
 Externally: renamed to pro/hello.pro.renamed-merge.
@@ -121,7 +122,8 @@ Enter "y" or "n" (or just press <return> for "n") diff3 pro/hello.pro.renamed-lo
 3:3c
   Merge contents (1)
 Reverted 'pro/hello.pro.renamed-merge'
-Resolved conflicted state of 'pro/hello.pro'
+#IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro'
+#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved.
 __OUT__
 file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
 #-------------------------------------------------------------------------------
diff --git a/t/fcm-conflicts/09-tree-rename-rename-same.t b/t/fcm-conflicts/09-tree-rename-rename-same.t
index e0702643..34eb438b 100644
--- a/t/fcm-conflicts/09-tree-rename-rename-same.t
+++ b/t/fcm-conflicts/09-tree-rename-rename-same.t
@@ -112,7 +112,8 @@ Externally: added.
 Answer (y) to keep the local file filename.
 Answer (n) to keep the external file filename.
 Keep the local version?
-Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'pro/hello.pro.renamed'
+#IF SVN1.8/9 Enter "y" or "n" (or just press <return> for "n") Resolved conflicted state of 'pro/hello.pro.renamed'
+#IF SVN1.10 Enter "y" or "n" (or just press <return> for "n") Tree conflict at 'pro/hello.pro.renamed' marked as resolved.
 __OUT__
 file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
 #-------------------------------------------------------------------------------