Ron Gilbert wrote:
> I'm not sure if this is a svn issues, a tsvn issue or an operator issue,
> but I spent several hours today trying to fix the mess it created.
>
> I had a folder (containing about 100 archived files) that I wanted to
> rename (from Foo2 to Foo3). I right clicked on the folder and selected
> "TortoiseSVN->rename" and changed the name. After about 30 seconds, the
> new folder (Foo3) appears with the modified exclamation point icon and
> the old folder (Foo2) had the red X icon.
>
> Everything looked fine.
>
> I continued to work on files in the new Foo3 folder, and when I was done
> for the day, I went to commit the folder (Foo3) to the archive and was
> greeted with a stream of errors about files not being in the archive,
> etc. Unfortunately I was a little panic about loosing a lot of work and
When you rename stuff, you always have to commit both, the new and the
old (removed) items together. You should have committed from the parent
folder of Foo2 and Foo3.
Also, the error message indicates that you should have done an update
first before committing.
> did not keep careful notes about the errors. After several tempts to
> get things committed, updated or reverted, I finally copied all the
> files out of the folder, deleted both folders from the archive and
> re-added all my files (loosing all the revision).
>
> What did I do wrong?
>
> The only thing that I can think of that might have been bad were files
> in the old folder (Foo2) that had not been committed when I did the
> Rename, but I would assume it would deal with that (or at lease complain
> gracefully).
Renames in Subversion aren't really renames. They're deletes/adds with
preserving the history.
Another thing: once you've renamed folders, you should commit the rename
immediately before you modify those files any further.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Jun 4 09:49:50 2005