Re: Cannot commit files that I've renamed.
From: Alf Lacis <Alf.Lacis_at_aiscientific.com>
Date: 2006-03-24 02:42:09 CET
> "D:\CompanyData\ProjDev\svn\PSPS", while the CygWin path is something
I also tried to commit the renamed files from Windows Exploder/TortoiseSVN
A point I forgot to mention is that we upgraded Subversion & ToitoiseSVN
TortoiseSVN 1.2.6, Build 4786 - 32 Bit
I've been using these cygwin/bash/scripts (see below) FOR NEARLY A YEAR.
Also, I've renamed a handful of the several hundred files in the projects
I *WORKED* *AROUND* by the method already described:
To repeat: The ToitoiseSVN Rename and either the subversion commit or
The scripts I use are shown below. Note the use of 'cd':
# 20051121 agl Added xad.
# 20051121 agl Added xad.
if [ -f svn_commit.txt ] ; then
echo cat svn_commit.txt
svn commit --force-log -F svn_commit.txt
echo File svn_commit.txt, containing the commit message, must exist for
-- 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" <email@example.com> 23/03/2006 10:23 PM To: <firstname.lastname@example.org>, "Alf Lacis" <Alf.Lacis@aiscientific.com> cc: "Christoph Tschopp" <email@example.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: firstname.lastname@example.org For additional commands, e-mail: email@example.comReceived on Fri Mar 24 02:43:28 2006
This is an archived mail posted to the Subversion Users mailing list.