From 10bc84981b30ff0c563a1bfa6526bf01373382a9 Mon Sep 17 00:00:00 2001 From: mhagger Date: Sun, 1 Apr 2012 09:06:19 +0000 Subject: [PATCH] Add a test for the keyword expansion fix in r5379. Patch by: Maciek Sakrejda git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@5380 be7e6eca-30d4-0310-a8e5-ac0d63af7087 --- run-tests.py | 7 +++ .../dir/kv-deleted.txt,v | 55 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 test-data/internal-co-keywords-cvsrepos/dir/kv-deleted.txt,v diff --git a/run-tests.py b/run-tests.py index bf3761f5..6308abc7 100755 --- a/run-tests.py +++ b/run-tests.py @@ -3283,11 +3283,18 @@ def internal_co_keywords(): kk_cvs = file(conv_cvs.get_wc('trunk', 'dir', 'kk.txt')).read() kv_ic = file(conv_ic.get_wc('trunk', 'dir', 'kv.txt')).read() kv_cvs = file(conv_cvs.get_wc('trunk', 'dir', 'kv.txt')).read() + # Ensure proper "/Attic" expansion of $Source$ keyword in files + # which are in a deleted state in trunk + del_ic = file(conv_ic.get_wc('branches/b', 'dir', 'kv-deleted.txt')).read() + del_cvs = file(conv_cvs.get_wc('branches/b', 'dir', 'kv-deleted.txt')).read() + if ko_ic != ko_cvs: raise Failure() if kk_ic != kk_cvs: raise Failure() + if del_ic != del_cvs: + raise Failure() # The date format changed between cvs and co ('/' instead of '-'). # Accept either one: diff --git a/test-data/internal-co-keywords-cvsrepos/dir/kv-deleted.txt,v b/test-data/internal-co-keywords-cvsrepos/dir/kv-deleted.txt,v new file mode 100644 index 00000000..b9551c2b --- /dev/null +++ b/test-data/internal-co-keywords-cvsrepos/dir/kv-deleted.txt,v @@ -0,0 +1,55 @@ +head 1.2; +branch; +access; +symbols + b:1.1.1; +locks; strict; +comment @# @; + + +1.2 +date 2004.07.28.10.42.27; author kfogel; state dead; +branches; +next 1.1; + +1.1 +date 2004.07.19.20.57.24; author jrandom; state Exp; +branches 1.1.1.1; +next ; + +1.1.1.1 +date 2004.07.19.20.57.25; author jrandom; state Exp; +branches; +next ; + +desc +@@ + + +1.2 +log +@Deleting this dreadful file +@ +text +@This is a fine file. + +This file resides at $Source$ +@ + + +1.1 +log +@Add a file. +@ +text +@@ + + +1.1.1.1 +log +@Adding a line +@ +text +@a1 1 +branches are fun +@ -- 2.11.4.GIT