From d3026b64289857ba98b421f8aa421c68b48fd87f Mon Sep 17 00:00:00 2001 From: dpmatthews Date: Fri, 8 Dec 2023 17:43:32 +0000 Subject: [PATCH] Modify test to work with svn 1.14 + remove Ubuntu 18.04 --- .github/workflows/tests.yaml | 2 +- t/fcm-branch-diff/00-simple.t | 100 +++++++++---------- t/fcm-conflicts/00-tree-add-add.t | 4 +- t/fcm-conflicts/01-tree-delete-delete.t | 4 +- t/fcm-conflicts/02-tree-delete-edit.t | 4 +- t/fcm-conflicts/03-tree-delete-rename.t | 5 +- t/fcm-conflicts/04-tree-edit-delete.t | 2 +- t/fcm-conflicts/05-tree-edit-rename.t | 100 +++++++++++++------ t/fcm-conflicts/06-tree-rename-delete.t | 4 +- t/fcm-conflicts/07-tree-rename-edit.t | 4 +- t/fcm-conflicts/08-tree-rename-rename-diff.t | 4 +- t/fcm-conflicts/09-tree-rename-rename-same.t | 10 +- t/fcm-conflicts/10-text.t | 2 +- t/fcm-conflicts/11-tree-edit-replace.t | 2 +- t/fcm-merge/00-simple.t | 22 ++-- t/fcm-merge/01-complex.t | 56 +++++------ t/lib/bash/test_header | 40 ++++++-- 17 files changed, 213 insertions(+), 152 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 9bd448b1..95a71194 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -5,7 +5,7 @@ jobs: strategy: fail-fast: False matrix: - ubuntu: ['ubuntu-18.04', 'ubuntu-20.04', 'ubuntu-22.04'] + ubuntu: ['ubuntu-20.04', 'ubuntu-22.04'] name: FCM Tests ${{matrix.ubuntu}} runs-on: ${{matrix.ubuntu}} steps: diff --git a/t/fcm-branch-diff/00-simple.t b/t/fcm-branch-diff/00-simple.t index 2272f978..c69ec8a4 100644 --- a/t/fcm-branch-diff/00-simple.t +++ b/t/fcm-branch-diff/00-simple.t @@ -62,8 +62,8 @@ Index: added_directory/hello_constants.f90 =================================================================== #IF SVN1.8 --- added_directory/hello_constants.f90 ($ROOT_URL/trunk) (revision 0) #IF SVN1.8 +++ added_directory/hello_constants.f90 (revision 6) -#IF SVN1.9/10 --- added_directory/hello_constants.f90 (.../trunk) (working copy) -#IF SVN1.9/10 +++ added_directory/hello_constants.f90 (.../branches/dev/Share/branch_test) (revision 6) +#IF SVN1.9/10/14 --- added_directory/hello_constants.f90 (.../trunk) (working copy) +#IF SVN1.9/10/14 +++ added_directory/hello_constants.f90 (.../branches/dev/Share/branch_test) (revision 6) @@ -0,0 +1,5 @@ +MODULE Hello_Constants + @@ -74,8 +74,8 @@ Index: added_directory/hello_constants.inc =================================================================== #IF SVN1.8 --- added_directory/hello_constants.inc ($ROOT_URL/trunk) (revision 0) #IF SVN1.8 +++ added_directory/hello_constants.inc (revision 6) -#IF SVN1.9/10 --- added_directory/hello_constants.inc (.../trunk) (working copy) -#IF SVN1.9/10 +++ added_directory/hello_constants.inc (.../branches/dev/Share/branch_test) (revision 6) +#IF SVN1.9/10/14 --- added_directory/hello_constants.inc (.../trunk) (working copy) +#IF SVN1.9/10/14 +++ added_directory/hello_constants.inc (.../branches/dev/Share/branch_test) (revision 6) @@ -0,0 +1,2 @@ +CHARACTER ( +LEN=80), PARAMETER :: hello_strINg = 'Hello Earth!!' @@ -83,24 +83,24 @@ Index: added_directory/hello_constants_dummy.inc =================================================================== #IF SVN1.8 --- added_directory/hello_constants_dummy.inc ($ROOT_URL/trunk) (revision 0) #IF SVN1.8 +++ added_directory/hello_constants_dummy.inc (revision 6) -#IF SVN1.9/10 --- added_directory/hello_constants_dummy.inc (.../trunk) (working copy) -#IF SVN1.9/10 +++ added_directory/hello_constants_dummy.inc (.../branches/dev/Share/branch_test) (revision 6) +#IF SVN1.9/10/14 --- added_directory/hello_constants_dummy.inc (.../trunk) (working copy) +#IF SVN1.9/10/14 +++ added_directory/hello_constants_dummy.inc (.../branches/dev/Share/branch_test) (revision 6) @@ -0,0 +1 @@ +INCLUDE 'hello_constants.INc' Index: added_file =================================================================== #IF SVN1.8 --- added_file ($ROOT_URL/trunk) (revision 0) #IF SVN1.8 +++ added_file (revision 6) -#IF SVN1.9/10 --- added_file (.../trunk) (working copy) -#IF SVN1.9/10 +++ added_file (.../branches/dev/Share/branch_test) (revision 6) +#IF SVN1.9/10/14 --- added_file (.../trunk) (working copy) +#IF SVN1.9/10/14 +++ added_file (.../branches/dev/Share/branch_test) (revision 6) @@ -0,0 +1 @@ +INCLUDE 'hello_constants.INc' Index: lib/python/info/poems.py =================================================================== #IF SVN1.8 --- lib/python/info/poems.py ($ROOT_URL/trunk) (revision 1) #IF SVN1.8 +++ lib/python/info/poems.py (working copy) -#IF SVN1.9/10 --- lib/python/info/poems.py (.../trunk) (revision 1) -#IF SVN1.9/10 +++ lib/python/info/poems.py (.../branches/dev/Share/branch_test) (working copy) +#IF SVN1.9/10/14 --- lib/python/info/poems.py (.../trunk) (revision 1) +#IF SVN1.9/10/14 +++ lib/python/info/poems.py (.../branches/dev/Share/branch_test) (working copy) @@ -1,24 +1,23 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- @@ -139,8 +139,8 @@ Index: module/hello_constants.f90 =================================================================== #IF SVN1.8 --- module/hello_constants.f90 ($ROOT_URL/trunk) (revision 1) #IF SVN1.8 +++ module/hello_constants.f90 (working copy) -#IF SVN1.9/10 --- module/hello_constants.f90 (.../trunk) (revision 1) -#IF SVN1.9/10 +++ module/hello_constants.f90 (.../branches/dev/Share/branch_test) (working copy) +#IF SVN1.9/10/14 --- module/hello_constants.f90 (.../trunk) (revision 1) +#IF SVN1.9/10/14 +++ module/hello_constants.f90 (.../branches/dev/Share/branch_test) (working copy) @@ -1,5 +0,0 @@ -MODULE Hello_Constants - @@ -151,16 +151,16 @@ Index: module/hello_constants.inc =================================================================== #IF SVN1.8 --- module/hello_constants.inc ($ROOT_URL/trunk) (revision 1) #IF SVN1.8 +++ module/hello_constants.inc (working copy) -#IF SVN1.9/10 --- module/hello_constants.inc (.../trunk) (revision 1) -#IF SVN1.9/10 +++ module/hello_constants.inc (.../branches/dev/Share/branch_test) (working copy) +#IF SVN1.9/10/14 --- module/hello_constants.inc (.../trunk) (revision 1) +#IF SVN1.9/10/14 +++ module/hello_constants.inc (.../branches/dev/Share/branch_test) (working copy) @@ -1 +0,0 @@ -CHARACTER (LEN=80), PARAMETER :: hello_string = 'Hello Earth!' Index: module/hello_constants_dummy.inc =================================================================== #IF SVN1.8 --- module/hello_constants_dummy.inc ($ROOT_URL/trunk) (revision 1) #IF SVN1.8 +++ module/hello_constants_dummy.inc (working copy) -#IF SVN1.9/10 --- module/hello_constants_dummy.inc (.../trunk) (revision 1) -#IF SVN1.9/10 +++ module/hello_constants_dummy.inc (.../branches/dev/Share/branch_test) (working copy) +#IF SVN1.9/10/14 --- module/hello_constants_dummy.inc (.../trunk) (revision 1) +#IF SVN1.9/10/14 +++ module/hello_constants_dummy.inc (.../branches/dev/Share/branch_test) (working copy) @@ -1 +0,0 @@ -INCLUDE 'hello_constants.inc' __OUT__ @@ -176,8 +176,8 @@ Index: added_directory/hello_constants.f90 =================================================================== #IF SVN1.8 --- added_directory/hello_constants.f90 ($ROOT_URL/trunk) (revision 0) #IF SVN1.8 +++ added_directory/hello_constants.f90 (revision 6) -#IF SVN1.9/10 --- added_directory/hello_constants.f90 (.../trunk) (working copy) -#IF SVN1.9/10 +++ added_directory/hello_constants.f90 (.../branches/dev/Share/branch_test) (revision 6) +#IF SVN1.9/10/14 --- added_directory/hello_constants.f90 (.../trunk) (working copy) +#IF SVN1.9/10/14 +++ added_directory/hello_constants.f90 (.../branches/dev/Share/branch_test) (revision 6) @@ -0,0 +1,5 @@ +MODULE Hello_Constants + @@ -188,8 +188,8 @@ Index: added_directory/hello_constants.inc =================================================================== #IF SVN1.8 --- added_directory/hello_constants.inc ($ROOT_URL/trunk) (revision 0) #IF SVN1.8 +++ added_directory/hello_constants.inc (revision 6) -#IF SVN1.9/10 --- added_directory/hello_constants.inc (.../trunk) (working copy) -#IF SVN1.9/10 +++ added_directory/hello_constants.inc (.../branches/dev/Share/branch_test) (revision 6) +#IF SVN1.9/10/14 --- added_directory/hello_constants.inc (.../trunk) (working copy) +#IF SVN1.9/10/14 +++ added_directory/hello_constants.inc (.../branches/dev/Share/branch_test) (revision 6) @@ -0,0 +1,2 @@ +CHARACTER ( +LEN=80), PARAMETER :: hello_strINg = 'Hello Earth!!' @@ -197,24 +197,24 @@ Index: added_directory/hello_constants_dummy.inc =================================================================== #IF SVN1.8 --- added_directory/hello_constants_dummy.inc ($ROOT_URL/trunk) (revision 0) #IF SVN1.8 +++ added_directory/hello_constants_dummy.inc (revision 6) -#IF SVN1.9/10 --- added_directory/hello_constants_dummy.inc (.../trunk) (working copy) -#IF SVN1.9/10 +++ added_directory/hello_constants_dummy.inc (.../branches/dev/Share/branch_test) (revision 6) +#IF SVN1.9/10/14 --- added_directory/hello_constants_dummy.inc (.../trunk) (working copy) +#IF SVN1.9/10/14 +++ added_directory/hello_constants_dummy.inc (.../branches/dev/Share/branch_test) (revision 6) @@ -0,0 +1 @@ +INCLUDE 'hello_constants.INc' Index: added_file =================================================================== #IF SVN1.8 --- added_file ($ROOT_URL/trunk) (revision 0) #IF SVN1.8 +++ added_file (revision 6) -#IF SVN1.9/10 --- added_file (.../trunk) (working copy) -#IF SVN1.9/10 +++ added_file (.../branches/dev/Share/branch_test) (revision 6) +#IF SVN1.9/10/14 --- added_file (.../trunk) (working copy) +#IF SVN1.9/10/14 +++ added_file (.../branches/dev/Share/branch_test) (revision 6) @@ -0,0 +1 @@ +INCLUDE 'hello_constants.INc' Index: lib/python/info/poems.py =================================================================== #IF SVN1.8 --- lib/python/info/poems.py ($ROOT_URL/trunk) (revision 1) #IF SVN1.8 +++ lib/python/info/poems.py (working copy) -#IF SVN1.9/10 --- lib/python/info/poems.py (.../trunk) (revision 1) -#IF SVN1.9/10 +++ lib/python/info/poems.py (.../branches/dev/Share/branch_test) (working copy) +#IF SVN1.9/10/14 --- lib/python/info/poems.py (.../trunk) (revision 1) +#IF SVN1.9/10/14 +++ lib/python/info/poems.py (.../branches/dev/Share/branch_test) (working copy) @@ -1,24 +1,23 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- @@ -253,8 +253,8 @@ Index: module/hello_constants.f90 =================================================================== #IF SVN1.8 --- module/hello_constants.f90 ($ROOT_URL/trunk) (revision 1) #IF SVN1.8 +++ module/hello_constants.f90 (working copy) -#IF SVN1.9/10 --- module/hello_constants.f90 (.../trunk) (revision 1) -#IF SVN1.9/10 +++ module/hello_constants.f90 (.../branches/dev/Share/branch_test) (working copy) +#IF SVN1.9/10/14 --- module/hello_constants.f90 (.../trunk) (revision 1) +#IF SVN1.9/10/14 +++ module/hello_constants.f90 (.../branches/dev/Share/branch_test) (working copy) @@ -1,5 +0,0 @@ -MODULE Hello_Constants - @@ -265,16 +265,16 @@ Index: module/hello_constants.inc =================================================================== #IF SVN1.8 --- module/hello_constants.inc ($ROOT_URL/trunk) (revision 1) #IF SVN1.8 +++ module/hello_constants.inc (working copy) -#IF SVN1.9/10 --- module/hello_constants.inc (.../trunk) (revision 1) -#IF SVN1.9/10 +++ module/hello_constants.inc (.../branches/dev/Share/branch_test) (working copy) +#IF SVN1.9/10/14 --- module/hello_constants.inc (.../trunk) (revision 1) +#IF SVN1.9/10/14 +++ module/hello_constants.inc (.../branches/dev/Share/branch_test) (working copy) @@ -1 +0,0 @@ -CHARACTER (LEN=80), PARAMETER :: hello_string = 'Hello Earth!' Index: module/hello_constants_dummy.inc =================================================================== #IF SVN1.8 --- module/hello_constants_dummy.inc ($ROOT_URL/trunk) (revision 1) #IF SVN1.8 +++ module/hello_constants_dummy.inc (working copy) -#IF SVN1.9/10 --- module/hello_constants_dummy.inc (.../trunk) (revision 1) -#IF SVN1.9/10 +++ module/hello_constants_dummy.inc (.../branches/dev/Share/branch_test) (working copy) +#IF SVN1.9/10/14 --- module/hello_constants_dummy.inc (.../trunk) (revision 1) +#IF SVN1.9/10/14 +++ module/hello_constants_dummy.inc (.../branches/dev/Share/branch_test) (working copy) @@ -1 +0,0 @@ -INCLUDE 'hello_constants.inc' __OUT__ @@ -320,16 +320,16 @@ Index: added_directory/foo00-simple-bdi-wc-changes =================================================================== #IF SVN1.8 --- added_directory/foo00-simple-bdi-wc-changes ($ROOT_URL/trunk) (revision 0) #IF SVN1.8 +++ added_directory/foo00-simple-bdi-wc-changes (working copy) -#IF SVN1.9/10 --- added_directory/foo00-simple-bdi-wc-changes (.../trunk) (working copy) -#IF SVN1.9/10 +++ added_directory/foo00-simple-bdi-wc-changes (.../branches/dev/Share/branch_test) (working copy) +#IF SVN1.9/10/14 --- added_directory/foo00-simple-bdi-wc-changes (.../trunk) (working copy) +#IF SVN1.9/10/14 +++ added_directory/foo00-simple-bdi-wc-changes (.../branches/dev/Share/branch_test) (working copy) @@ -0,0 +1 @@ +foo Index: added_directory/hello_constants.f90 =================================================================== #IF SVN1.8 --- added_directory/hello_constants.f90 ($ROOT_URL/trunk) (revision 0) #IF SVN1.8 +++ added_directory/hello_constants.f90 (revision 6) -#IF SVN1.9/10 --- added_directory/hello_constants.f90 (.../trunk) (working copy) -#IF SVN1.9/10 +++ added_directory/hello_constants.f90 (.../branches/dev/Share/branch_test) (revision 6) +#IF SVN1.9/10/14 --- added_directory/hello_constants.f90 (.../trunk) (working copy) +#IF SVN1.9/10/14 +++ added_directory/hello_constants.f90 (.../branches/dev/Share/branch_test) (revision 6) @@ -0,0 +1,5 @@ +MODULE Hello_Constants + @@ -340,8 +340,8 @@ Index: added_directory/hello_constants.inc =================================================================== #IF SVN1.8 --- added_directory/hello_constants.inc ($ROOT_URL/trunk) (revision 0) #IF SVN1.8 +++ added_directory/hello_constants.inc (revision 6) -#IF SVN1.9/10 --- added_directory/hello_constants.inc (.../trunk) (working copy) -#IF SVN1.9/10 +++ added_directory/hello_constants.inc (.../branches/dev/Share/branch_test) (revision 6) +#IF SVN1.9/10/14 --- added_directory/hello_constants.inc (.../trunk) (working copy) +#IF SVN1.9/10/14 +++ added_directory/hello_constants.inc (.../branches/dev/Share/branch_test) (revision 6) @@ -0,0 +1,2 @@ +CHARACTER ( +LEN=80), PARAMETER :: hello_strINg = 'Hello Earth!!' @@ -349,24 +349,24 @@ Index: added_directory/hello_constants_dummy.inc =================================================================== #IF SVN1.8 --- added_directory/hello_constants_dummy.inc ($ROOT_URL/trunk) (revision 0) #IF SVN1.8 +++ added_directory/hello_constants_dummy.inc (revision 6) -#IF SVN1.9/10 --- added_directory/hello_constants_dummy.inc (.../trunk) (working copy) -#IF SVN1.9/10 +++ added_directory/hello_constants_dummy.inc (.../branches/dev/Share/branch_test) (revision 6) +#IF SVN1.9/10/14 --- added_directory/hello_constants_dummy.inc (.../trunk) (working copy) +#IF SVN1.9/10/14 +++ added_directory/hello_constants_dummy.inc (.../branches/dev/Share/branch_test) (revision 6) @@ -0,0 +1 @@ +INCLUDE 'hello_constants.INc' Index: added_file =================================================================== #IF SVN1.8 --- added_file ($ROOT_URL/trunk) (revision 0) #IF SVN1.8 +++ added_file (revision 6) -#IF SVN1.9/10 --- added_file (.../trunk) (working copy) -#IF SVN1.9/10 +++ added_file (.../branches/dev/Share/branch_test) (revision 6) +#IF SVN1.9/10/14 --- added_file (.../trunk) (working copy) +#IF SVN1.9/10/14 +++ added_file (.../branches/dev/Share/branch_test) (revision 6) @@ -0,0 +1 @@ +INCLUDE 'hello_constants.INc' Index: lib/python/info/poems.py =================================================================== #IF SVN1.8 --- lib/python/info/poems.py ($ROOT_URL/trunk) (revision 1) #IF SVN1.8 +++ lib/python/info/poems.py (working copy) -#IF SVN1.9/10 --- lib/python/info/poems.py (.../trunk) (revision 1) -#IF SVN1.9/10 +++ lib/python/info/poems.py (.../branches/dev/Share/branch_test) (working copy) +#IF SVN1.9/10/14 --- lib/python/info/poems.py (.../trunk) (revision 1) +#IF SVN1.9/10/14 +++ lib/python/info/poems.py (.../branches/dev/Share/branch_test) (working copy) @@ -1,24 +1,23 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- @@ -405,8 +405,8 @@ Index: module/hello_constants.f90 =================================================================== #IF SVN1.8 --- module/hello_constants.f90 ($ROOT_URL/trunk) (revision 1) #IF SVN1.8 +++ module/hello_constants.f90 (working copy) -#IF SVN1.9/10 --- module/hello_constants.f90 (.../trunk) (revision 1) -#IF SVN1.9/10 +++ module/hello_constants.f90 (.../branches/dev/Share/branch_test) (working copy) +#IF SVN1.9/10/14 --- module/hello_constants.f90 (.../trunk) (revision 1) +#IF SVN1.9/10/14 +++ module/hello_constants.f90 (.../branches/dev/Share/branch_test) (working copy) @@ -1,5 +0,0 @@ -MODULE Hello_Constants - @@ -417,16 +417,16 @@ Index: module/hello_constants.inc =================================================================== #IF SVN1.8 --- module/hello_constants.inc ($ROOT_URL/trunk) (revision 1) #IF SVN1.8 +++ module/hello_constants.inc (working copy) -#IF SVN1.9/10 --- module/hello_constants.inc (.../trunk) (revision 1) -#IF SVN1.9/10 +++ module/hello_constants.inc (.../branches/dev/Share/branch_test) (working copy) +#IF SVN1.9/10/14 --- module/hello_constants.inc (.../trunk) (revision 1) +#IF SVN1.9/10/14 +++ module/hello_constants.inc (.../branches/dev/Share/branch_test) (working copy) @@ -1 +0,0 @@ -CHARACTER (LEN=80), PARAMETER :: hello_string = 'Hello Earth!' Index: module/hello_constants_dummy.inc =================================================================== #IF SVN1.8 --- module/hello_constants_dummy.inc ($ROOT_URL/trunk) (revision 1) #IF SVN1.8 +++ module/hello_constants_dummy.inc (working copy) -#IF SVN1.9/10 --- module/hello_constants_dummy.inc (.../trunk) (revision 1) -#IF SVN1.9/10 +++ module/hello_constants_dummy.inc (.../branches/dev/Share/branch_test) (working copy) +#IF SVN1.9/10/14 --- module/hello_constants_dummy.inc (.../trunk) (revision 1) +#IF SVN1.9/10/14 +++ module/hello_constants_dummy.inc (.../branches/dev/Share/branch_test) (working copy) @@ -1 +0,0 @@ -INCLUDE 'hello_constants.inc' __OUT__ diff --git a/t/fcm-conflicts/00-tree-add-add.t b/t/fcm-conflicts/00-tree-add-add.t index 54e2dd64..e5938a0e 100644 --- a/t/fcm-conflicts/00-tree-add-add.t +++ b/t/fcm-conflicts/00-tree-add-add.t @@ -56,7 +56,7 @@ Answer (y) to keep the local file filename. Answer (n) to keep the external file filename. Keep the local version? #IF SVN1.8/9 Enter "y" or "n" (or just press for "n") Resolved conflicted state of 'new_file' -#IF SVN1.10 Enter "y" or "n" (or just press for "n") Tree conflict at 'new_file' marked as resolved. +#IF SVN1.10/14 Enter "y" or "n" (or just press for "n") Tree conflict at 'new_file' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") Resolved conflicted state of 'new_file' -#IF SVN1.10 Enter "y" or "n" (or just press for "n") Tree conflict at 'new_file' marked as resolved. +#IF SVN1.10/14 Enter "y" or "n" (or just press for "n") Tree conflict at 'new_file' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") Resolved conflicted state of 'pro/hello.pro' -#IF SVN1.10 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.10/14 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") Resolved conflicted state of 'pro/hello.pro' -#IF SVN1.10 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.10/14 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") A 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. +#IF SVN1.10/14 Tree conflict at 'pro/hello.pro' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") Resolved conflicted state of 'pro/hello.pro' -#IF SVN1.10 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.10/14 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") Resolved conflicted state of 'pro/hello.pro' -#IF SVN1.10 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.10/14 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") Reverted 'pro/hello.pro.renamed' #IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro' -#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.10/14 Tree conflict at 'pro/hello.pro' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") Resolved conflicted state of 'pro/hello.pro' -#IF SVN1.10 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.10/14 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" /dev/null -run_pass "$TEST_KEY" fcm conflicts <<__IN__ +if [[ $SVN_MINOR_VERSION == "1.14" ]]; then + run_pass "$TEST_KEY" fcm conflicts <<__IN__ +y +__IN__ +else + run_pass "$TEST_KEY" fcm conflicts <<__IN__ n __IN__ -file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ -[info] pro/hello.pro: in tree conflict. -Locally: edited. -Externally: renamed to pro/hello.pro.renamed. -Answer (y) to keep the file. -Answer (n) to accept the external rename. -You can then merge in changes. -Keep the local version? -Enter "y" or "n" (or just press for "n") diff3 pro/hello.pro.renamed.working pro/hello.pro.renamed.merge-left.r1 pro/hello.pro.renamed.merge-right.r8 +fi +file_cmp_filtered "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__ +#IF SVN1.8/9/10 [info] pro/hello.pro: in tree conflict. +#IF SVN1.14 [info] pro/hello.pro.renamed: in text conflict. +#IF SVN1.8/9/10 Locally: edited. +#IF SVN1.8/9/10 Externally: renamed to pro/hello.pro.renamed. +#IF SVN1.8/9/10 Answer (y) to keep the file. +#IF SVN1.8/9/10 Answer (n) to accept the external rename. +#IF SVN1.8/9/10 You can then merge in changes. +#IF SVN1.8/9/10 Keep the local version? +#IF SVN1.8/9/10 Enter "y" or "n" (or just press for "n") diff3 pro/hello.pro.renamed.working pro/hello.pro.renamed.merge-left.r1 pro/hello.pro.renamed.merge-right.r8 +#IF SVN1.14 diff3 $PWD/pro/hello.pro.renamed.3.tmp $PWD/pro/hello.pro.renamed.tmp $PWD/pro/hello.pro.renamed.2.tmp ==== 1:3c Local contents (1) @@ -67,17 +75,21 @@ Enter "y" or "n" (or just press for "n") diff3 pro/hello.pro.renamed.wo 3:3,4c Merge contents (1) Merge contents (2) -D pro/hello.pro +#IF SVN1.8/9/10 D pro/hello.pro +#IF SVN1.14 Run "svn resolve --accept working pro/hello.pro.renamed"? +#IF SVN1.14 Enter "y" or "n" (or just press for "n") Merge conflicts in 'pro/hello.pro.renamed' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" moved to pro/hello.pro.renamed A + pro/hello.pro.renamed +#IF SVN1.14 > moved from pro/hello.pro __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" >>>>>> .new __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") diff3 pro/hello.pro.working pro/hello.pro.merge-left.r1 pro/hello.pro.merge-right.r8 +#IF SVN1.8/9/10 [info] pro/hello.pro: in tree conflict. +#IF SVN1.14 [info] pro/hello.pro.renamed: in text conflict. +#IF SVN1.8/9/10 Locally: edited. +#IF SVN1.8/9/10 Externally: renamed to pro/hello.pro.renamed. +#IF SVN1.8/9/10 Answer (y) to keep the file. +#IF SVN1.8/9/10 Answer (n) to accept the external rename. +#IF SVN1.8/9/10 You can then merge in changes. +#IF SVN1.8/9/10 Keep the local version? +#IF SVN1.8/9/10 Enter "y" or "n" (or just press for "n") diff3 pro/hello.pro.working pro/hello.pro.merge-left.r1 pro/hello.pro.merge-right.r8 +#IF SVN1.14 diff3 $PWD/pro/hello.pro.renamed.3.tmp $PWD/pro/hello.pro.renamed.tmp $PWD/pro/hello.pro.renamed.2.tmp ==== 1:3c Local contents (1) @@ -140,17 +162,23 @@ Enter "y" or "n" (or just press for "n") diff3 pro/hello.pro.working pr 3:3,4c Merge contents (1) Merge contents (2) -Reverted 'pro/hello.pro.renamed' +#IF SVN1.8/9/10 Reverted 'pro/hello.pro.renamed' #IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro' #IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.14 Run "svn resolve --accept working pro/hello.pro.renamed"? +#IF SVN1.14 Enter "y" or "n" (or just press for "n") Merge conflicts in 'pro/hello.pro.renamed' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" moved to pro/hello.pro.renamed +#IF SVN1.14 A + pro/hello.pro.renamed +#IF SVN1.14 > moved from pro/hello.pro __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" >>>>>> .new __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") D pro/hello.pro.renamed #IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro' -#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.10/14 Tree conflict at 'pro/hello.pro' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") Resolved conflicted state of 'pro/hello.pro' -#IF SVN1.10 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.10/14 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") diff3 pro/hello.pro.renamed.wo A pro/hello.pro D pro/hello.pro.renamed #IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro' -#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.10/14 Tree conflict at 'pro/hello.pro' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") diff3 pro/hello.pro.renamed.wo 3:3c Merge contents (1) #IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro' -#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.10/14 Tree conflict at 'pro/hello.pro' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") diff3 pro/hello.pro.renamed-me Merge contents (1) D pro/hello.pro.renamed-local #IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro' -#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.10/14 Tree conflict at 'pro/hello.pro' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") diff3 pro/hello.pro.renamed-lo Merge contents (1) Reverted 'pro/hello.pro.renamed-merge' #IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro' -#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.10/14 Tree conflict at 'pro/hello.pro' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") D pro/hello.pro.renamed #IF SVN1.8/9 Resolved conflicted state of 'pro/hello.pro' -#IF SVN1.10 Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.10/14 Tree conflict at 'pro/hello.pro' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") Resolved conflicted state of 'pro/hello.pro' -#IF SVN1.10 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.10/14 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. [info] pro/hello.pro.renamed: in tree conflict. Locally: added. Externally: added. @@ -113,7 +113,7 @@ Answer (y) to keep the local file filename. Answer (n) to keep the external file filename. Keep the local version? #IF SVN1.8/9 Enter "y" or "n" (or just press for "n") Resolved conflicted state of 'pro/hello.pro.renamed' -#IF SVN1.10 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro.renamed' marked as resolved. +#IF SVN1.10/14 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro.renamed' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") Resolved conflicted state of 'pro/hello.pro' -#IF SVN1.10 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.10/14 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. [info] pro/hello.pro.renamed: in tree conflict. Locally: added. Externally: added. @@ -165,7 +165,7 @@ Answer (y) to keep the local file filename. Answer (n) to keep the external file filename. Keep the local version? #IF SVN1.8/9 Enter "y" or "n" (or just press for "n") Resolved conflicted state of 'pro/hello.pro.renamed' -#IF SVN1.10 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro.renamed' marked as resolved. +#IF SVN1.10/14 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro.renamed' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") Resolved conflicted state of 'lib/python/info/poems.py' -#IF SVN1.10 Enter "y" or "n" (or just press for "n") Merge conflicts in 'lib/python/info/poems.py' marked as resolved. +#IF SVN1.10/14 Enter "y" or "n" (or just press for "n") Merge conflicts in 'lib/python/info/poems.py' marked as resolved. __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" for "n") Resolved conflicted state of 'pro/hello.pro' -#IF SVN1.10 Enter "y" or "n" (or just press for "n") Tree conflict at 'pro/hello.pro' marked as resolved. +#IF SVN1.10/14 Enter "y" or "n" (or just press for "n") 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-merge/00-simple.t b/t/fcm-merge/00-simple.t index 7bdfa944..2a3bd057 100644 --- a/t/fcm-merge/00-simple.t +++ b/t/fcm-merge/00-simple.t @@ -160,16 +160,16 @@ Index: . Property changes on: . ___________________________________________________________________ Added: svn:mergeinfo -#IF SVN1.9/10 ## -0,0 +0,1 ## +#IF SVN1.9/10/14 ## -0,0 +0,1 ## Merged /branches/dev/Share/merge1:r4-5 -#IF SVN1.9/10 Index: added_directory/hello_constants.f90 -#IF SVN1.9/10 =================================================================== -#IF SVN1.9/10 Index: added_directory/hello_constants.inc -#IF SVN1.9/10 =================================================================== -#IF SVN1.9/10 Index: added_directory/hello_constants_dummy.inc -#IF SVN1.9/10 =================================================================== -#IF SVN1.9/10 Index: added_file -#IF SVN1.9/10 =================================================================== +#IF SVN1.9/10/14 Index: added_directory/hello_constants.f90 +#IF SVN1.9/10/14 =================================================================== +#IF SVN1.9/10/14 Index: added_directory/hello_constants.inc +#IF SVN1.9/10/14 =================================================================== +#IF SVN1.9/10/14 Index: added_directory/hello_constants_dummy.inc +#IF SVN1.9/10/14 =================================================================== +#IF SVN1.9/10/14 Index: added_file +#IF SVN1.9/10/14 =================================================================== Index: lib/python/info/poems.py =================================================================== --- lib/python/info/poems.py (revision 9) @@ -234,8 +234,8 @@ Index: module/hello_constants_dummy.inc @@ -1 +1 @@ -INCLUDE 'hello_constants.inc' +INCLUDE 'hello_constants.INc' -#IF SVN1.9/10 Index: module/tree_conflict_file -#IF SVN1.9/10 =================================================================== +#IF SVN1.9/10/14 Index: module/tree_conflict_file +#IF SVN1.9/10/14 =================================================================== Index: subroutine/hello_sub_dummy.h =================================================================== --- subroutine/hello_sub_dummy.h (revision 9) diff --git a/t/fcm-merge/01-complex.t b/t/fcm-merge/01-complex.t index 6f6d4fff..dc57f890 100644 --- a/t/fcm-merge/01-complex.t +++ b/t/fcm-merge/01-complex.t @@ -105,7 +105,7 @@ Index: . Property changes on: . ___________________________________________________________________ Added: svn:mergeinfo -#IF SVN1.9/10 ## -0,0 +0,1 ## +#IF SVN1.9/10/14 ## -0,0 +0,1 ## Merged /${PROJECT}trunk:r2-9 Index: lib/python/info/__init__.py =================================================================== @@ -306,16 +306,16 @@ Index: . Property changes on: . ___________________________________________________________________ Added: svn:mergeinfo -#IF SVN1.9/10 ## -0,0 +0,1 ## +#IF SVN1.9/10/14 ## -0,0 +0,1 ## Merged /${PROJECT}branches/dev/Share/merge1:r4-11 -#IF SVN1.9/10 Index: added_directory/hello_constants.f90 -#IF SVN1.9/10 =================================================================== -#IF SVN1.9/10 Index: added_directory/hello_constants.inc -#IF SVN1.9/10 =================================================================== -#IF SVN1.9/10 Index: added_directory/hello_constants_dummy.inc -#IF SVN1.9/10 =================================================================== -#IF SVN1.9/10 Index: added_file -#IF SVN1.9/10 =================================================================== +#IF SVN1.9/10/14 Index: added_directory/hello_constants.f90 +#IF SVN1.9/10/14 =================================================================== +#IF SVN1.9/10/14 Index: added_directory/hello_constants.inc +#IF SVN1.9/10/14 =================================================================== +#IF SVN1.9/10/14 Index: added_directory/hello_constants_dummy.inc +#IF SVN1.9/10/14 =================================================================== +#IF SVN1.9/10/14 Index: added_file +#IF SVN1.9/10/14 =================================================================== Index: lib/python/info/poems.py =================================================================== --- lib/python/info/poems.py (revision 11) @@ -380,8 +380,8 @@ Index: module/hello_constants_dummy.inc @@ -1 +1 @@ -INCLUDE 'hello_constants.inc' +INCLUDE 'hello_constants.INc' -#IF SVN1.9/10 Index: module/tree_conflict_file -#IF SVN1.9/10 =================================================================== +#IF SVN1.9/10/14 Index: module/tree_conflict_file +#IF SVN1.9/10/14 =================================================================== Index: subroutine/hello_sub_dummy.h =================================================================== --- subroutine/hello_sub_dummy.h (revision 11) @@ -580,7 +580,7 @@ Index: . Property changes on: . ___________________________________________________________________ Modified: svn:mergeinfo -#IF SVN1.9/10 ## -0,0 +0,1 ## +#IF SVN1.9/10/14 ## -0,0 +0,1 ## Merged /${PROJECT}branches/dev/Share/merge1:r12-13 Index: added_file =================================================================== @@ -772,7 +772,7 @@ Index: . Property changes on: . ___________________________________________________________________ Modified: svn:mergeinfo -#IF SVN1.9/10 ## -0,0 +0,1 ## +#IF SVN1.9/10/14 ## -0,0 +0,1 ## Merged /${PROJECT}trunk:r10-16 Index: added_file =================================================================== @@ -979,7 +979,7 @@ Index: . Property changes on: . ___________________________________________________________________ Modified: svn:mergeinfo -#IF SVN1.9/10 ## -0,0 +0,1 ## +#IF SVN1.9/10/14 ## -0,0 +0,1 ## Merged /${PROJECT}branches/dev/Share/merge1:r14-19 Index: added_directory/hello_constants_dummy.inc =================================================================== @@ -988,8 +988,8 @@ Index: added_directory/hello_constants_dummy.inc @@ -1,2 +0,0 @@ -INCLUDE 'hello_constants.INc' -# added this line for simple repeat testing -#IF SVN1.9/10 Index: added_file.add -#IF SVN1.9/10 =================================================================== +#IF SVN1.9/10/14 Index: added_file.add +#IF SVN1.9/10/14 =================================================================== __OUT__ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" /dev/null; then @@ -175,25 +176,41 @@ function file_cmp_filtered() { cat $FILE_EXPECT | sed \ -e "s/^#IF SVN1.8 //g" \ -e "s/^#IF SVN1.8\/9 //g" \ - -e "/^#IF SVN1.9 /d" \ + -e "s/^#IF SVN1.8\/9\/10 //g" \ + -e "/^#IF SVN1.9\/10\/14 /d" \ -e "/^#IF SVN1.10 /d" \ - -e "/^#IF SVN1.9\/10 /d" \ + -e "/^#IF SVN1.10\/14 /d" \ + -e "/^#IF SVN1.14 /d" \ >"$TEST_DIR/$TEST_KEY.filtered-ctrl" elif [[ $SVN_MINOR_VERSION == "1.9" ]]; then cat $FILE_EXPECT | sed \ - -e "s/^#IF SVN1.9 //g" \ -e "s/^#IF SVN1.8\/9 //g" \ - -e "s/^#IF SVN1.9\/10 //g" \ + -e "s/^#IF SVN1.8\/9\/10 //g" \ + -e "s/^#IF SVN1.9\/10\/14 //g" \ -e "/^#IF SVN1.8 /d" \ -e "/^#IF SVN1.10 /d" \ + -e "/^#IF SVN1.10\/14 /d" \ + -e "/^#IF SVN1.14 /d" \ >"$TEST_DIR/$TEST_KEY.filtered-ctrl" - else + elif [[ $SVN_MINOR_VERSION == "1.10" ]]; then cat $FILE_EXPECT | sed \ + -e "s/^#IF SVN1.8\/9\/10 //g" \ + -e "s/^#IF SVN1.9\/10\/14 //g" \ -e "s/^#IF SVN1.10 //g" \ - -e "s/^#IF SVN1.9\/10 //g" \ + -e "s/^#IF SVN1.10\/14 //g" \ -e "/^#IF SVN1.8 /d" \ - -e "/^#IF SVN1.9 /d" \ -e "/^#IF SVN1.8\/9 /d" \ + -e "/^#IF SVN1.14 /d" \ + >"$TEST_DIR/$TEST_KEY.filtered-ctrl" + else + cat $FILE_EXPECT | sed \ + -e "s/^#IF SVN1.10\/14 //g" \ + -e "s/^#IF SVN1.9\/10\/14 //g" \ + -e "/^#IF SVN1.8 /d" \ + -e "/^#IF SVN1.8\/9 /d" \ + -e "/^#IF SVN1.8\/9\/10 /d" \ + -e "/^#IF SVN1.10 /d" \ + -e "s/^#IF SVN1.14 //g" \ >"$TEST_DIR/$TEST_KEY.filtered-ctrl" fi file_cmp "$1" "$2" "$TEST_DIR/$TEST_KEY.filtered-ctrl" @@ -303,7 +320,7 @@ if status_lines: } function check_svn_version() { - if [[ ! $SVN_MINOR_VERSION =~ ^1\.(8|9|10)$ ]]; then + if [[ ! $SVN_MINOR_VERSION =~ ^1\.(8|9|10|14)$ ]]; then skip_all "Tests require Subversion 1.8 or later" exit 0 fi @@ -333,11 +350,14 @@ export FCM_HOME PATH=$FCM_HOME/bin:$PATH SVN_MINOR_VERSION=undef +SVN_VERSION=undef if svn --version 1>/dev/null 2>&1; then SVN_MINOR_VERSION=$(svn --version | \ sed -n "s/^svn, version 1.\([0-9]\+\)\.[0-9]\+ .*/1.\1/p") - # Treat versions 1.10 and above the same for the moment - [[ $SVN_MINOR_VERSION =~ ^1\.1[0-9]$ ]] && SVN_MINOR_VERSION=1.10 + SVN_VERSION=$(svn --version | \ + sed -n "s/^svn, version 1.\([0-9\.]\+\) .*/1.\1/p") + # Treat version 1.13 like 1.14 + [[ $SVN_MINOR_VERSION == "1.13" ]] && SVN_MINOR_VERSION=1.14 fi TEST_KEY_BASE=$(basename $0 .t)