Re: Cannot commit files that I've renamed.
From: Alf Lacis <Alf.Lacis_at_aiscientific.com>
Date: 2006-03-23 01:09:51 CET
Phillip,
I also tried to commit the renamed files from Windows Exploder/TortoiseSVN
I had Tortoise/Renamed the two files. There is *some* problem here. A
TortoiseSVN 1.2.6, Build 4786 - 32 Bit
If you don't want to believe me, fine, but I experienced the reality of
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 over the last
I *WORKED* *AROUND* by the method already described:
To repeat: The ToitoiseSVN Rename and *TortoiseSVN* commit should have
The scripts I use are shown below. Note the use of 'cd':
# 20051121 agl Added xad.
svn update
# 20051121 agl Added xad.
if [ -f svn_commit.txt ] ; then
echo cat svn_commit.txt
svn commit --force-log -F svn_commit.txt
else
echo File svn_commit.txt, containing the commit message, must exist for
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 = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = Phillip Susi <psusi@cfl.rr.com> 23/03/2006 07:43 AM To: Alf Lacis <Alf.Lacis@aiscientific.com> cc: users@subversion.tigris.org, Christoph Tschopp <christoph.tschopp@aiscientific.com> Subject: Re: Cannot commit files that I've renamed. I believe the problem is because you are using cygwin. Cygwin is a nasty hack and causes problems like the one you are seeing, so if you want to use tortoise you should get a mingw svn command line build, not cygwin. It looks like the problem is that tortoise is using windows style path names, and cygwin uses unix style path names. Instead of doing the rename with tortoise, try doing it from the command line and see if you can commit. 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? > > --------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org For additional commands, e-mail: users-help@subversion.tigris.orgReceived on Thu Mar 23 01:11:23 2006 |
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.