Help - Search - Members - Calendar
Full Version: Commit error
Hash, Inc. Forums > Featured > Feature Films: Tin Woodman of Oz - Scarecrow of Oz > Scarecrow of Oz > SO:General Discussion
Animus
I have committed chors before without any problem, but this time I get this message:
Command: Commit
Modified: Scarecrow of Oz\Act I\Seq01-The_Argument\Sc01\1_01_01.cho
Error: Commit failed (details follow):
Error: File or directory '1_01_01.cho' is out of date; try updating
Error: The version resource does not correspond to the resource within the
Error: transaction. Either the requested version resource is out of date (needs to be
Error: updated), or the requested version resource is newer than the transaction root
Error: (restart the commit).
Finished!:

If I update as suggested, I guess that would overwrite the work I have done since the last commit.

Michel

martin
QUOTE(Animus @ Oct 7 2008, 05:44 PM) *
If I update as suggested, I guess that would overwrite the work I have done since the last commit.

No, you'll be okay.

First, save another copy of your work just in case.

Now, do an "Update." If you get a "conflict," right-click on the conflicted file (probably "1_01_01.cho") and pick "Use Mine." Continue.
KenH
No. Update. If any work has been done on a different part of the file, it'll be merged into your file. If work has been done on the same part of the file as you, then it'll conflict. That's another problem, but you won't loose your work in either scenario.
If you're nervous about it, just make a copy of your file and put it outside the svn tree. After you do it, you won't be nervous next time.
mouseman
I believe when there is a conflict, Subversion (Tortoise SVN) will create a file in your folder called (in this example) "1_01_01.cho.mine", which has your original file contents before the failed update. It also has files with ".r0000000" (where 0000000 is some number indicating the revisions).

It's good practice to do an update before you start working, and do one before you commit.
Animus
Thank you! It's working now. I had a misconception of what the"update"command did.

Michel
This is a "lo-fi" version of our main content. To view the full version with more information, formatting and images, please click here.
Invision Power Board © 2001-2012 Invision Power Services, Inc.