http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58197
Bug ID: 58197
Summary: subversion-1.8.x breaks script contrib/gcc_update
Product: gcc
Version: unknown
Status: UNCONFIRMED
Severity: normal
Priority: P3
Component: other
Assignee: unassigned at gcc dot gnu.org
Reporter: [email protected]
Hi,
installing subversion-1.8.x breaks checkout of the svn-repository because
'svn info' adds an additional line.
The command used:
svn co svn://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch gcc-4.8-branch
(cd gcc-4.8-branch; ./contrib/gcc_update)
the diff for 'svn info' with subversion-1.7.11 and subversion-1.8.1:
# diff -u svn-info-1711 svn-info-181
--- svn-info-1711 2013-08-19 22:10:59.480215273 +0200
+++ svn-info-181 2013-08-19 22:09:48.011278900 +0200
@@ -1,6 +1,7 @@
Path: .
Working Copy Root Path: /home/winfried/gcc-svn/gcc-4.8-branch
URL: svn://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch
+Relative URL: ^/branches/gcc-4_8-branch
Repository Root: svn://gcc.gnu.org/svn/gcc
Repository UUID: 138bc75d-0d04-0410-961f-82ee72b054a4
Revision: 201852
This results in a broken gcc/REVISION which breaks compilation because
it's used to generate version-header:
# diff -ur -x.svn gcc-4.8-svn1711/gcc/REVISION gcc-4.8-svn18x/gcc/REVISION
--- gcc-4.8-svn1711/gcc/REVISION 2013-08-19 20:35:03.353241599 +0200
+++ gcc-4.8-svn18x/gcc/REVISION 2013-08-19 21:34:33.115310266 +0200
@@ -1 +1,2 @@
-[gcc-4_8-branch revision 201852]
+[gcc-4_8-branch
+gcc-4_8-branch revision 201854]
the script-part from contrib/gcc_update matches twice for /URL:/
branch=`$GCC_SVN info | sed -ne "/URL:/ {
s,.*/trunk,trunk,
s,.*/branches/,,
s,.*/tags/,,
p
}"`
using 'sh -x contrib/gcc_update' has the following diff:
# diff -u up.out.1711 up.out.181
++ svn info
@@ -33,13 +32,15 @@
s,.*/tags/,,
p
}'
-+ branch=gcc-4_8-branch
++ branch='gcc-4_8-branch
+gcc-4_8-branch'
+ rm -f LAST_UPDATED gcc/REVISION
+ date
++ TZ=UTC
++ date
-+ echo 'Mon Aug 19 20:12:31 UTC 2013 (revision 201855)'
-+ echo '[gcc-4_8-branch revision 201855]'
++ echo 'Mon Aug 19 20:14:22 UTC 2013 (revision 201855)'
++ echo '[gcc-4_8-branch
+gcc-4_8-branch revision 201855]'
A trivial fix would be something like /^URL:/ but I don't know
enough about ancient subversion-releases to be sure the line
has always started with '^URL:'.
