[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Cannot commit files that I've renamed.

From: Alf Lacis <Alf.Lacis_at_aiscientific.com>
Date: 2006-03-24 02:42:09 CET

Dear Nico,
You wrote:
> I think the issue is that the path name in TortoiseSVN is something like

> "D:\CompanyData\ProjDev\svn\PSPS", while the CygWin path is something
like
> "D:/CompanyData/ProjDev/svn/PSPS". The filename handling for CygWin is
> always an issue, as is the handling of end-of-line characters.

I also tried to commit the renamed files from Windows Exploder/TortoiseSVN
-- *SAME* *PROBLEM*.

A point I forgot to mention is that we upgraded Subversion & ToitoiseSVN
clients about 10 days ago. This is the first renaming of files that I've
done since then. Versions now are:
Subversion command-line client, version 1.2.3.

TortoiseSVN 1.2.6, Build 4786 - 32 Bit
Subversion 1.2.3,
apr 0.9.6
apr-iconv 0.9.5
apr-utils 0.9.6
berkeley db 4.3.28
neon 0.24.7
OpenSSL 0.9.8a 11 Oct 2005
zlib 1.2.3

I've been using these cygwin/bash/scripts (see below) FOR NEARLY A YEAR.
Everything *perfect* till now.

Also, I've renamed a handful of the several hundred files in the projects
over the last year or so: all OK.

I *WORKED* *AROUND* by the method already described:
>> "I could only fix this by 'Tortoise Revert' on these two files, then
>> 'Tortoise Deleting' them, and 'Tortoise Add'ing them(the new ones)."

To repeat: The ToitoiseSVN Rename and either the subversion commit or
*TortoiseSVN* commit should have worked. Neither subversion nor Tortoise
commits worked.

The scripts I use are shown below. Note the use of 'cd':
./svn_update.sh:
--------------------------------
#!/bin/bash -x

# 20051121 agl Added xad.
# 20050701 AGL Original version.

              svn update
cd libs_all ; svn update
cd ../ac1 ; svn update
cd ../ac2 ; svn update
cd ../ac3 ; svn update
cd ../xad ; svn update
cd ../bios ; svn update
cd ../srt ; svn update
--------------------------------
./svn_commit.sh:
--------------------------------
#!/bin/bash

# 20051121 agl Added xad.
# 20050707 AGL Added --force-log option, since svn_commit.txt is now a
versioned file.
# 20050706 AGL Moved message from here to file svn_commit.txt.
# 20050701 AGL Original version.

if [ -f svn_commit.txt ] ; then

echo cat svn_commit.txt
     cat svn_commit.txt

              svn commit --force-log -F svn_commit.txt
cd libs_all ; svn commit --force-log -F ../svn_commit.txt
cd ../ac1 ; svn commit --force-log -F ../svn_commit.txt
cd ../ac2 ; svn commit --force-log -F ../svn_commit.txt
cd ../ac3 ; svn commit --force-log -F ../svn_commit.txt
cd ../xad ; svn commit --force-log -F ../svn_commit.txt
cd ../bios ; svn commit --force-log -F ../svn_commit.txt
cd ../srt ; svn commit --force-log -F ../svn_commit.txt

else

echo File svn_commit.txt, containing the commit message, must exist for
this command to work.

fi
--------------------------------

-- 
Regards, 
Alf Lacis 
Senior Software & Design Engineer 
A.i. Scientific Pty Ltd 
10-22 Hornibrook Esplanade 
CLONTARF QLD 4019 
AUSTRALIA 
Ph: (+617 or 07) 3105 5087 
www.aiscientific.com 
= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = 
= = = 
"Nico Kadel-Garcia" <nkadel@comcast.net>
23/03/2006 10:23 PM
 
        To:     <users@subversion.tigris.org>, "Alf Lacis" <Alf.Lacis@aiscientific.com>
        cc:     "Christoph Tschopp" <christoph.tschopp@aiscientific.com>
        Subject:        Re:  Cannot commit files that I've renamed.
Alf Lacis wrote:
> Hi,
> I used Tortoise SVN to 'Tortoise Rename':
>        move_long.c to srt_state_m.c, and
>        move_long.h to srt_state_m.h
>
> I then used Subversion from a cygwin|bash command line to check in my
> eight subproject repository changes.  Some output, snipped to show
> highlights, is shown below.
>
> alacis@AIS-PC95 /cygdrive/d/firmware
> $ ./svn_update.sh ; ./svn_commit.sh        <<<< this commits eight
> subprojects
> + svn update
> At revision 2247.
> + cd libs_all
> + svn update
> <SNIP>
> Sending        bcr.h
> Sending        doxygen/Doxyfile
> Adding  (bin)  doxygen/help.chm
> Sending        global.h
> Sending        main.c
> Deleting       move_long.c                 <<<< this was Tortoise
> Renamed to srt_state_m.c
> Deleting       move_long.h                 <<<< this was Tortoise
> Renamed to srt_state_m.h
> Sending        parser_body_local.i
> Sending        parser_head_local.h
> Sending        parser_table_local.i
> Sending        srt.hwp
> Adding         srt_state_m.c                     <<<< commit failed on
> this file.
> svn: Commit failed (details follow):
> svn: Couldn't determine absolute path of
> 'D:/CompanyData/ProjDev/svn/PSPS' alacis@AIS-PC95 /cygdrive/d/firmware
> $
>
> I could only fix this by 'Tortoise Revert' on these two files, then
> 'Tortoise Deleting' them, and 'Tortoise Add'ing them.
>
> Then doing a Subversion commit worked OK.
>
> Should the original 'Tortoise Rename' have worked?
> What should I do in the future?
I think the issue is that the path name in TortoiseSVN is something like 
"D:\CompanyData\ProjDev\svn\PSPS", while the CygWin path is something like 
"D:/CompanyData/ProjDev/svn/PSPS". The filename handling for CygWin is 
always an issue, as is the handling of end-of-line characters. 
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 24 02:43:28 2006

This is an archived mail posted to the Subversion Users mailing list.