commit failed: File or directory'.' is out of date.

[web...@tigris.org]

I am having a problem that I can't figure out how to fix. I keep repositories on a server and check out working copies at work and at home of my code. Well, I think I may have made some changes at home and committed them, but didn't update my working copy at work. I then did my work and do not want to use the changes to the code I made at home. When I try to commit the working copy at work I get the error Commit Failed(Details follow): File or directory '.' is out of date;try updating the resource out of date; try updating.

How can I resolve this? I tried clean, but nothing changed. I must confess I do not grasp the functionality of TortoiseSVN beyond a very basic level.

Thank you for your help.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1713539

To unsubscribe from this discussion, e-mail: [users-un...@tortoisesvn.tigris.org].

[Bob Archer]

You can't just decide to revert by commiting and out of date copy from
another wc. You have to update the file and pull out the previously made
changes or you need to do a reverse merge to file the revision in the
repository. Look at the help on how to revert a committed file.

BOb

> unsub...@tortoisesvn.tigris.org].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1713641

[web...@tigris.org]

Thank you for your help. I read the file and I tried it but I expected it to revert to build 63 but it said build 66, from 65. I figure I did something wrong. I resolved it by exporting the working copy that I wanted to keep and then made sure both working copies were the same revision. I then replaced the working copy files at work with the export that I made. It showed no changes so I guess it may have reverted but increased the version number. I then updated my working copy at home. Both are now on the same version.

Thank you again for your help.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1714208

[Bob Archer]

Yes, that is how it works. You don't actually back out the revision. The
merge backs out the changes made in for example revision 65 then you
commit it and it will then be revision 66 which should now match rev 64.
Basically the same thing that would happen if you manually deleted the
change and committed again.

BOb

> -----Original Message-----
> From: web...@tigris.org [mailto:web...@tigris.org]

> To unsubscribe from this discussion, e-mail: [users-
> unsub...@tortoisesvn.tigris.org].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1714768