On 24 March 2015 at 18:41, Christian Reynolds
<christian.reynolds_at_rocketmail.com> wrote:
> Hi,
>
> I am having difficulty updating the repository after I have undone a change. When I revert a file back to a previous revision instead of the Working Copy showing a red circle with an exclamation mark like it should do as the Working Copy is now out of sync with the repository I just have a green circle with a tick. Sub sequentially, if I try and commit the changes I can't as the software says there is nothing to commit. Basically this means the revision option which is meant to be a fundamental part of the software is useless as I can never commit the revisions to the repository. This can't be right. Any advice anyone?
No it's not right. It sounds as if you used Update-to-revision instead
of reverting changes, and there is a subtle but important difference.
Update-to-revision takes your working copy back to a state in the
past; the pristine copy in your working copy is that older revision
and if you edit the file then the changes are relative to that older
revision, not the latest revision. And you can never commit from that
state anyway as you can only commit a file which is updated to the
latest revision.
The way to do this is to update your WC to head and use the log dialog
to show you the list of previous revisions. If you right click on an
earlier revision you can then select 'Revert to this revision'. That
effectively applies all the later changes in reverse. You will now
have a red exclamation point and you can commit the change.
Simon
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3108166
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-03-24 22:42:07 CET