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: webpost_at_tigris.org [mailto:webpost_at_tigris.org]
> Sent: Tuesday, April 14, 2009 2:15 PM
> To: users_at_tortoisesvn.tigris.org
> Subject: RE: commit failed: File or directory'.' is out of date.
>
> 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&dsMessage
Id
> =1714208
>
> To unsubscribe from this discussion, e-mail: [users-
> unsubscribe_at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1714768
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-14 21:03:08 CEST