On Thu, Sep 10, 2009 at 02:21:08AM -0700, Stein Somers wrote:
> I encountered the same after a relatively short sequence in a new working copy. Server and client are version 1.6.5. I did not try to reproduce this but I will if someone wants to. The steps were IIRC:
> 1. check out a particular revision
> 2. edit one of the files, say "foo"
> 3. update to a later revision, which involves deleting the file foo. This gave a conflict. I left the conflict and foo the way it was and forgot about it.
> 4. try to update back to the earlier revision. Tree conflict, of course. Resolved using "theirs" but now file foo is still unversioned. Delete file foo from the file system and try again to update to the earlier revision. Nothing changes, foo does not reappear.
You cannot resolve a tree conflict using "theirs".
You can only resolve it to "working".
Can you provide a command-line transcript of what you did exactly?
Human-language descriptions are nice but not 100% reliable in
communicating exactly what commands need to be typed to trigger
the problem.
Thanks,
Stefan
> 5. So let's try to correct things by doing step 3 and 4 again. Alas now step 4 crashes with the exception.
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2393185
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2393223
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-10 14:33:20 CEST