The local copy is what I want to add, I dont care that its out of date. I know manually that this file is the latest and most up to date but I cant add it back to the server bc I dont have the most recent version checked out...
views:
14answers:
1
+1
A:
- Save a copy of your file with a different name
- Delete the original local copy
- Get the latest version of the containing folder from Tortoise
- Replace new local copy with the copy from step 1
- SVN Commit to complete
If you have a problem with this, please paste the exact error message.
DJ Quimby
2010-10-13 18:39:37
when i save slides1.ctp to the elements folder should i "add" it back using svn... even if i delete it fully im getting the same error
adam
2010-10-13 18:57:56
Reworded answer, basically you shouldn't be performing an 'add' to your svn.
DJ Quimby
2010-10-13 19:20:22
still cant get past step 3... ive tried #1 two ways... saving slides.ctp as slides1.ctp in notepad++ also just renaming via tortoise...
adam
2010-10-13 19:33:41
sorry- hitting ENTER submits the comment... step #2 im not sure if im supposed to delete the local via tortoise or not, so im getting the same exact error when i try #3
adam
2010-10-13 19:35:19
ok i got a clean update i renamed as a totally new file then deleted existing OUTSIDE of tortoise
adam
2010-10-13 19:38:05
now i have slides10.ctp with no green checkbox and slides.ctp is gone... what to do:)
adam
2010-10-13 19:39:16
I'm assuming slides10.ctp is your copy? If so, do an SVN Update on the folder. As long as the file isn't deleted from the repository, it should restore the latest version of slide.ctp for you. This is the file you will overwrite with slides10.ctp
DJ Quimby
2010-10-13 19:54:05
ok sorry - last question i think we are making progress.. by overwrite (im usually not this slow) do you want me to rename slides10 to slides.. and inside tortoise or outside.. im just new to svn and tortoise- overwriting on a traditional desktop is just dragging the file etc but thats not really an option
adam
2010-10-13 20:14:46
Yep, I mean overwrite in the traditional Windows sense, not anything specific to Tortoise. Once you overwrite it you *should* be able to SVN Commit it back to your repository.And don't worry about the confusion. I love Tortoise, but I've had my issues with it as well.
DJ Quimby
2010-10-13 20:24:28
you on skype? find me aeb137 if you are- im closing the question bc im close to giving up - but if you think we can resolve it in real time ping me:) thanks
adam
2010-10-13 20:54:02
Skype Username is dj.quimby . At work now, but I'll look for you tonight when I get a free minute.
DJ Quimby
2010-10-13 20:59:52