From d3a53f64b9bc4786650df8f293136c44fe3a1b1e Mon Sep 17 00:00:00 2001
From: mhagger <mhagger@be7e6eca-30d4-0310-a8e5-ac0d63af7087>
Date: Tue, 24 May 2011 08:50:46 +0000
Subject: [PATCH] Add a test of an RCS file that contains a newphrase.

It is XFail for now.

The test file is derived from a file provided by
Giovanni Pellicciotta <giovanni.pellicciotta@anubex.com>.

git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@5359 be7e6eca-30d4-0310-a8e5-ac0d63af7087
---
 run-tests.py                            |  11 +++
 test-data/newphrases-cvsrepos/file001,v | 141 ++++++++++++++++++++++++++++++++
 2 files changed, 152 insertions(+)
 create mode 100644 test-data/newphrases-cvsrepos/file001,v

diff --git a/run-tests.py b/run-tests.py
index e6817ef6..34134d61 100755
--- a/run-tests.py
+++ b/run-tests.py
@@ -3974,6 +3974,15 @@ def missing_vendor_branch():
     raise Failure()
 
 
+@Cvs2SvnTestFunction
+def newphrases():
+  "newphrases in RCS files"
+
+  ensure_conversion(
+      'newphrases',
+      )
+
+
 ########################################################################
 # Run the tests
 
@@ -4187,6 +4196,8 @@ test_list = [
     move_parent,
     log_message_eols,
     missing_vendor_branch,
+# 180:
+    XFail(newphrases),
     ]
 
 if __name__ == '__main__':
diff --git a/test-data/newphrases-cvsrepos/file001,v b/test-data/newphrases-cvsrepos/file001,v
new file mode 100644
index 00000000..e8f9b89d
--- /dev/null
+++ b/test-data/newphrases-cvsrepos/file001,v
@@ -0,0 +1,141 @@
+head	1.7;
+access;
+symbols
+	symbol00000:1.7
+	symbol00001:1.7.0.8
+	symbol00002:1.7
+	symbol00003:1.7.0.6
+	symbol00004:1.7
+	symbol00005:1.7.0.4
+	symbol00006:1.7
+	symbol00007:1.7.0.2
+	symbol00008:1.7
+	symbol00009:1.3
+	symbol00010:1.3.0.2;
+locks; strict;
+comment	@ * @;
+
+this-is-a-newphrase:1.3	;
+
+1.7
+date	2003.04.23.12.15.16;	author author1;	state Exp;
+branches;
+next	1.6;
+
+1.6
+date	2003.04.10.08.39.59;	author author1;	state Exp;
+branches;
+next	1.5;
+
+1.5
+date	2003.01.27.16.35.38;	author author1;	state Exp;
+branches;
+next	1.4;
+
+1.4
+date	2002.11.28.11.50.18;	author author1;	state Exp;
+branches;
+next	1.3;
+
+1.3
+date	2002.09.19.08.30.17;	author author2;	state Exp;
+branches
+	1.3.2.1;
+next	1.2;
+
+1.2
+date	2002.08.06.12.15.33;	author author2;	state Exp;
+branches;
+next	1.1;
+
+1.1
+date	2002.03.07.09.51.58;	author author1;	state Exp;
+branches;
+next	;
+
+1.3.2.1
+date	2003.02.10.08.43.05;	author author2;	state Exp;
+branches;
+next	;
+
+
+desc
+@@
+
+
+1.7
+log
+@log 1@
+text
+@This text was last seen in HEAD (revision 1.7)
+@
+
+
+1.6
+log
+@log 2@
+text
+@d1 1
+a1 1
+This text was last seen in revision 1.6
+@
+
+
+1.5
+log
+@log 3@
+text
+@d1 1
+a1 1
+This text was last seen in revision 1.5
+@
+
+
+1.4
+log
+@log 4@
+text
+@d1 1
+a1 1
+This text was last seen in revision 1.4
+@
+
+
+1.3
+log
+@log 5@
+text
+@d1 1
+a1 1
+This text was last seen in revision 1.3
+@
+
+
+1.3.2.1
+log
+@log 6@
+text
+@d1 1
+a1 1
+This text was committed in revision 1.3.2.1
+@
+
+
+1.2
+log
+@log 7@
+text
+@d1 1
+a1 1
+This text was last seen in revision 1.2
+@
+
+
+1.1
+log
+@log 8@
+text
+@d1 1
+a1 1
+This text was last seen in revision 1.1
+@
-- 
2.11.4.GIT