On 2/13/07, Scott Nicolson <Scott.Nicolson@oscmar.co.nz> wrote:
> "Update to revision" does not help here as I can't remember the revision
> I was at before the update (this is a hypothetical question).
>
> A bit more information, I wanted to counteract the effect of an
> automatic merge by undoing the update. That is I have a working copy of
> unknown revision with some local modification and after an update is
> automatically merged. I would like to have the ability to undo this
> update and return to the file as it stood before the merge.
So, there's an automatic merge that happens on a daily basis? You
should be able to review the log to see when a revision was applied,
and use this as a basis for selecting a revision?
>
> "Update to revision" after this automatic merge causes a lot more
> complications as another merge task arises from this.
I guess I'm not sure what triggers this automatic merge? So now, if
you attempt to update to a particular revision, the auto-update will
get kicked off straight away? If this is the case, won't any other
means of backuping out an update do the same thing?
>
> I am aware of the show log features etc, but that doesn't help if a
> developer is not paying attention.
It seems odd that you want to automatically update a working copy for
a developer who is not paying attention, but allow them to make
updates in the working copy. From my ignorant point of view, I can't
understand why you'd want an unaware developer making changes to
anything.
It sounds like you have an automated update (I guess for a good
reason). But then you've got someone making changes in the working
copy, and when you have the local changes, you don't want any more
updates. Looks like you have a few options:
1) disable the automatic update.
2) update the automated process to only update the working copy if
there are no changes to it. If the status reports any changes, don't
do the update.
The only thing Tortoise could provide is a "Revert to last revision",
which will essentially look at the log to get the revision before the
last changes. But, even the most unaware developer would be able to
extract that from a log file if their build is not working..
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Feb 13 01:14:15 2007