Hi all!
cvs2svn breaks binary files and Subversion can't tell the difference between
two binary different files.
I have two problems.
Problem one:
The original file (bb) was migrated from cvs and now it differ from
the version that was in CVS. We checked that the file bb was checked into
cvs when the migration took place.
This looks like a bug in the cvs2svn program. This is not a big problem for
us, but annoying.
Problem two:
When we tried to correct the faulty file that was migrated Subversion
is unable to detect that we have made any changes to the file. To make
the reproduction the error easy we copied the original bb file
from the CVS checkout area into the bb.ok filename and added it into
Subversion. Then we show (see below) that subversion cant tell the
difference from the "migrated" binary file to the bb.ok file when we
overwrite the bb file with bb.ok. It have not problem seeing the
difference the other way around though, copying he faulty bb over
bb.ok and subversion detects the change to bb.ok file.
This is completely illogical to me so I assume it's a bug in Subversion.
We use the fsfs repository backend over NFS.
Environment dump:
MODULE_VERSION_STACK=3.1.6
REMOTEHOST=1xx.xx.xxx.xx
SUPPORTED=en_US.UTF-8:en_US:en
HOSTNAME=semldslxapp508
GRID_DIR=/usr/software/md/grid
PVM_RSH=/usr/bin/rsh
_MODULESBEGINENV_=/home/adbmbu/.modulesbeginenv
HOST=semldslxapp508
TERM=xterm
SHELL=/bin/bash
HISTSIZE=1000
SCHRODINGER_THIRDPARTY=/usr/software/macromodel/current/thirdparty
SSH_CLIENT=1xx.xx.xxx.xx 34331 22
PERL5LIB=/usr/software/perl/lib/perl5/5.8.0/i386-linux-thread-multi:/usr/sof
tware/perl/lib/perl5/5.8.0:/usr/software/perl/lib/perl5/site_perl/5.8.0/i386
-linux-thread-multi:/usr/software/perl/lib/perl5/site_perl/5.8.0
TA_BOOKSHELF=/usr/software/supported/tripos/current/sybyl/TriposBookshelf/do
cs
CVSROOT=:ext:hsgi04:/opt/CVSrepository
SCHRODINGER=/usr/software/macromodel/current
OE_DIR=/usr/software/openeye
OLDPWD=/home/adbmbu/src/hpc/cfengine_conf/trunk/scripts/LINUX/bigbrothersrv
DY_THORDB=/usr/software/daylight/thordb
SSH_TTY=/dev/pts/2
LANGVAR=en_US.UTF-8
TA_BROWSER=/usr/bin/mozilla
LD_LIBRARYN32_PATH=/usr/software/supported/tripos/current/sybyl/lib/linux
USER=adbmbu
LD_LIBRARY_PATH=/usr/software/daylight/current/lib
LS_COLORS=no=00:fi=00:di=00;34:ln=00;36:pi=40;33:so=00;35:bd=40;33;01:cd=40;
33;01:or=01;05;37;41:mi=01;05;37;41:ex=00;32:*.cmd=00;32:*.exe=00;32:*.com=0
0;32:*.btm=00;32:*.bat=00;32:*.sh=00;32:*.csh=00;32:*.tar=00;31:*.tgz=00;31:
*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.zip=00;31:*.z=00;31:*.Z=00;31:*.gz=00;
31:*.bz2=00;31:*.bz=00;31:*.tz=00;31:*.rpm=00;31:*.cpio=00;31:*.jpg=00;35:*.
gif=00;35:*.bmp=00;35:*.xbm=00;35:*.xpm=00;35:*.png=00;35:*.tif=00;35:MIA_LI
B=/usr/software/md/volsurf/lib
TA_HIVOL=/usr/software/supported/tripos/current/sybyl/HiVol/linux
PVM_ROOT=/opt/az/hpc/PVM/current
HOSTTYPE=i386-linux
SSH_AUTH_SOCK=/tmp/ssh-sbY15652/agent.15652
VOLSURF_DIR=/usr/software/md/volsurf
DY_LICENSEDATA=/usr/software/daylight/local/dy_license.semldslxapp508.dat
PVM_ARCH=LINUX
OE_LICENSE=/opt/az/hpc/etc/oe_license.txt
MODULE_VERSION=3.1.6
TA_LIB=/usr/software/supported/tripos/current/sybyl/lib/linux
VOLSURF_MODEL_LIBRARY=/usr/software/md/volsurf/models
MAIL=/var/spool/mail/adbmbu
PATH=/home/adbmbu/bin:/home/adbmbu/bin/LINUX:/usr/software/bin:/opt/az/suppo
rted/bin:/usr/software/macromodel/current:/usr/software/supported/tripos/cur
rent/sybyl/bin/linux:/usr/kerberos/bin:/usr/local/bin:/bin:/usr/bin:/usr/X11
R6/bin:/opt/mx/bin:/opt/az/hpc/PVM/current/bin:/usr/software/daylight/curren
t/bin:/usr/software/acq/bin:/usr/sbin:/sbin:/usr/software/daylight/current/b
in
IMPACT_EXEC=/usr/software/macromodel/current/impact-v35106/bin/Linux-x86
TA_ROOT=/usr/software/supported/tripos/current/sybyl
INPUTRC=/etc/inputrc
PWD=/home/adbmbu/src/hpc/cfengine_conf/trunk/scripts/LINUX/bigbrothersrv/bin
_LMFILES_=/opt/az/hpc/Modules/modulefiles/pvm:/opt/modules/3.1.6/modulefiles
/tripos:/opt/modules/3.1.6/modulefiles/null
TA_AZ_SPL=/usr/software/supported/tripos/current/AZ_spl
LANG=en_US.UTF-8
MODULEPATH=/opt/modules/$MODULE_VERSION/modulefiles:/opt/modules/modulefiles
:$HOME/modulefiles:/opt/az/hpc/Modules/modulefiles:
LOADEDMODULES=pvm:tripos:null
LM_LICENSE_FILE=27002@hsgi08.xxxx.xxxxxxxxxxx.xxx:27002@hsgi07.xxx.xxxxxxxxx
xx.xxx:27002@hsgi06.xxx.xxxxxxxxxxx.xxx
SSH_ASKPASS=/usr/libexec/openssh/gnome-ssh-askpass
MOE=/usr/software/moe/current
SHLVL=1
HOME=/home/adbmbu
TA_LICENSE_FILE=1717@hsgi08.xxx.xxxxxxxxxxx.xxx:1717@hsgi07.xxx.xxxxxxxxxxx.
xxx:1717@hsgi06.xxx.xxxxxxxxxxx.xxx
GOLD_DIR=/usr/software/gold/current
OSTYPE=linux
LD_ASSUME_KERNEL=2.4.1
GLOBAL_PATH_SET=1
MAESTRO_EXEC=/usr/software/macromodel/current/maestro-v70110/bin/Linux-x86
VENDOR=intel
PYTHONPATH=/usr/software/python:/usr/software/python/lib/python2.2/site-pack
ages
MACHTYPE=i386
LOGNAME=adbmbu
CVS_RSH=ssh
SSH_CONNECTION=1xx.xx.xxx.xx 34331 1xx.xx.xxx.xxx 22
MODULESHOME=/opt/modules/3.1.6
TA_GFX_BIN=/usr/software/supported/tripos/current/sybyl/misc/examples/gfx_to
ols/bin/linux
LESSOPEN=|/usr/bin/lesspipe.sh %s
DY_ROOT=/usr/software/daylight/current
MMSHARE_EXEC=/usr/software/macromodel/current/mmshare-v14017/bin/Linux-x86
MMOD_EXEC=/usr/software/macromodel/current/macromodel-v90014/bin/Linux-x86
JAGUAR_EXEC=/usr/software/macromodel/current/jaguar-v60011/bin/Linux-x86
DISPLAY=localhost:11.0
G_BROKEN_FILENAMES=1
_=/bin/env
History log showing the problem.
-bash-2.05b$ pwd
/home/adbmbu/src/hpc/cfengine_conf/trunk/scripts/LINUX/bigbrothersrv/bin
-bash-2.05b$ ls -al
total 120
drwxr-xr-x 3 adbmbu games 203 May 3 09:52 .
drwxr-xr-x 7 adbmbu games 159 May 2 16:04 ..
-rwxr-xr-x 1 adbmbu games 13864 May 3 09:53 bb
-rwxr-xr-x 1 adbmbu games 4529 Apr 27 17:39 bb-combo.sh
-rwxr-xr-x 1 adbmbu games 5646 Apr 27 17:39 bb-cpu.sh
-rwxr-xr-x 1 adbmbu games 6342 Apr 27 17:39 bb-disk.sh
-rwxr-xr-x 1 adbmbu games 2506 Apr 27 17:39 bb-local.sh
-rwxr-xr-x 1 adbmbu games 10055 Apr 27 17:39 bb-msgs.sh
-rwxr-xr-x 1 adbmbu games 13864 May 3 09:52 bb.ok
-rwxr-xr-x 1 adbmbu games 1425 Apr 27 17:39 bb-ping.sh
-rwxr-xr-x 1 adbmbu games 6760 Apr 27 17:39 bb-procs.sh
-rwxr-xr-x 1 adbmbu games 12488 Apr 27 17:39 bbrun
-rwxr-xr-x 1 adbmbu games 10760 Apr 27 17:39 getipaddr
drwxr-xr-x 7 adbmbu games 135 May 3 09:52 .svn
-rwxr-xr-x 1 adbmbu games 5132 Apr 27 17:39 touchtime
-bash-2.05b$ ldd bb
./bb: /lib/i686/libc.so.6: version `GLIBC_2.1' not found (required by ./bb)
./bb: /lib/i686/libc.so.6: version `GLIBC_2.0' not found (required by ./bb)
libc.so.6 => /lib/i686/libc.so.6 (0xb74a3000)
/lib/ld-linux.so.2 => /lib/ld-linux.so.2 (0xb75eb000)
-bash-2.05b$ ldd bb.ok
libc.so.6 => /lib/i686/libc.so.6 (0xb74a3000)
/lib/ld-linux.so.2 => /lib/ld-linux.so.2 (0xb75eb000)
-bash-2.05b$ svn status -u
Status against revision: 4200
-bash-2.05b$ cp bb bb.ok
-bash-2.05b$ svn status -u
M 4200 bb.ok
Status against revision: 4200
-bash-2.05b$ svn revert bb.ok
Reverted 'bb.ok'
-bash-2.05b$ cp bb.ok bb
-bash-2.05b$ svn status -u
Status against revision: 4200
-bash-2.05b$ cp ../bin.redhat7.3/bb .
-bash-2.05b$ diff bb bb.ok
Binary files bb and bb.ok differ
-bash-2.05b$ md5sum bb bb.ok
b18206edfe294c1216b962579430e1a8 bb
b87bdadad55f02d40692db1b68fd1281 bb.ok
-bash-2.05b$ ls -l bb bb.ok
-rwxr-xr-x 1 adbmbu games 13864 May 3 09:55 bb
-rwxr-xr-x 1 adbmbu games 13864 May 3 09:55 bb.ok
-bash-2.05b$ cp bb bb.ok
-bash-2.05b$ svn status -u
M 4200 bb.ok
Status against revision: 4200
-bash-2.05b$ svn revert bb.ok
Reverted 'bb.ok'
-bash-2.05b$ cp bb.ok bb
-bash-2.05b$ svn status -u
Status against revision: 4200
-bash-2.05b$ svn revert bb
-bash-2.05b$ cp ../bin.redhat7.3/bb .
-bash-2.05b$ svn --version
svn, version 1.1.3 (r12730)
compiled Jan 15 2005, 13:24:59
Copyright (C) 2000-2004 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet
(http://www.Collab.Net/).
The following repository access (RA) modules are available:
* ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol.
- handles 'http' schema
- handles 'https' schema
* ra_local : Module for accessing a repository on local disk.
- handles 'file' schema
* ra_svn : Module for accessing a repository using the svn network protocol.
- handles 'svn' schema
-bash-2.05b$ svn info bb
Path: bb
Name: bb
URL:
file:///projects/subversion/repos/hpc/cfengine_conf/trunk/scripts/LINUX/bigb
rothersrv/bin/bb
Repository UUID: b1b6bd39-baf5-0310-b6c4-e06db33240a0
Revision: 4197
Node Kind: file
Schedule: normal
Last Changed Author: adbalo
Last Changed Rev: 3766
Last Changed Date: 2004-11-12 11:35:59 +0100 (Fri, 12 Nov 2004)
Text Last Updated: 2005-05-03 09:56:21 +0200 (Tue, 03 May 2005)
Properties Last Updated: 2005-04-27 17:39:35 +0200 (Wed, 27 Apr 2005)
Checksum: b18206edfe294c1216b962579430e1a8
-bash-2.05b$ svn info bb.ok
Path: bb.ok
Name: bb.ok
URL:
file:///projects/subversion/repos/hpc/cfengine_conf/trunk/scripts/LINUX/bigb
rothersrv/bin/bb.ok
Repository UUID: b1b6bd39-baf5-0310-b6c4-e06db33240a0
Revision: 4200
Node Kind: file
Schedule: normal
Last Changed Author: adbmbu
Last Changed Rev: 4200
Last Changed Date: 2005-05-03 09:49:07 +0200 (Tue, 03 May 2005)
Text Last Updated: 2005-05-03 09:56:16 +0200 (Tue, 03 May 2005)
Properties Last Updated: 2005-05-03 09:48:44 +0200 (Tue, 03 May 2005)
Checksum: b87bdadad55f02d40692db1b68fd1281
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 3 12:09:10 2005