berny/findutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/findutils.git synced 2026-01-28 04:23:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Savannah bug #21568, use of obsolete CVS repository for gnulib

Browse Source
This commit is contained in:
James Youngman
2007-11-13 11:15:24 +00:00
parent 60556378fe
commit ed3acf4e27
4 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2007-11-13 James Youngman <jay@gnu.org>
* NEWS, configure.ac: Prepare for the release of findutils-4.3.10.
* import-gnulib.sh (usage): If the existing CVS working tree for
gnulib in the source tree does not yet point at the
git-cvs-pserver repository, move the old gnulib working tree out
of the way and do a fresh checkout. This fixes Savannah bug
#21568.
2007-11-11 James Youngman <jay@gnu.org>

8
NEWS
View File

@@ -1,4 +1,12 @@
GNU findutils NEWS - User visible changes. -*- outline -*- (allout)
* Major changes in release 4.3.10, 2007-11-13
** Bug Fixes
#21568: findutils gnulib code does not match the date in
import-gnulib.config. We now check out the gnulib code via
git-cvs-pserver.
* Major changes in release 4.3.9, 2007-11-11
** Licensing

2
configure.ac
View File

@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT([GNU findutils], 4.3.9, [bug-findutils@gnu.org])
AC_INIT([GNU findutils], 4.3.10, [bug-findutils@gnu.org])
AC_CONFIG_AUX_DIR(build-aux)
AM_INIT_AUTOMAKE

33
import-gnulib.sh
View File

@@ -95,17 +95,36 @@ do_checkout () {
# defaults refer to our own CVS repository for our code, not
# to gnulib.
cd $cvsdir
# gnulib now uses git as master repository, but used to use
# CVS. Check that we are not running against an old working
# directory which is still pointing at the old CVS repository.
rootfile=gnulib/CVS/Root
cvs_git_root=":pserver:anonymous@pserver.git.sv.gnu.org:/gnulib.git"
if test -d gnulib/CVS
then
if test x"$(cat $rootfile)" == x"$cvs_git_root"; then
echo "Using the git repository via git-cvs-pserver..."
else
echo "WARNING: Migrating from old CVS repository" >&2
# Force use of "cvs checkout" as opposed to update.
mv gnulib gnulib.before-git-migration
fi
fi
if test -d gnulib/CVS ; then
cd gnulib
cmd=update
root="" # use previous
cd gnulib
cmd=update
root="" # use previous
args=
else
root="-d :pserver:anonymous@cvs.sv.gnu.org:/sources/gnulib"
cmd=checkout
args=gnulib
cmd=checkout
root="-d $cvs_git_root"
args="-d gnulib HEAD"
fi
set -x
cvs -q -z3 $root $cmd $cvs_sticky_option "$gnulib_version" $args
cvs -q $root $cmd $cvs_sticky_option "$gnulib_version" $args
set +x
)
}