Thank you, very much, for your help. -----Original Message----- From: Les Mikesell [mailto:[email protected]] Sent: Wednesday, April 04, 2012 4:10 PM To: Reed, David Cc: Andy Levy; [email protected] Subject: Re: Update fails to delete a line of code
On Wed, Apr 4, 2012 at 2:59 PM, Reed, David <[email protected]> wrote: > Unfortunately, I can't answer that. I did it last week, and this was my > first chance to ask about it on the list. Being under pressure to make it > work, I ended up bypassing TortoiseSVN to force through my change, and so no > longer have good forensic evidence. > > I thought perhaps there was a known issue that someone on the list would be > familiar with. > > If it happens again, I'll try to document it better. My sincere apologies! For a really quick fix, I would have renamed the old file or moved it out of the directory and done the update again. That would ensure a new copy that exactly matched the repository version. But, the only reason you shouldn't have gotten that in the first place would have been uncommitted local modifications that conflicted. -- Les Mikesell [email protected] Confidentiality Note: This e-mail, and any attachment to it, contains privileged and confidential information intended only for the use of the individual(s) or entity named on the e-mail. If the reader of this e-mail is not the intended recipient, or the employee or agent responsible for delivering it to the intended recipient, you are hereby notified that reading it is strictly prohibited. If you have received this e-mail in error, please immediately return it to the sender and delete it from your system. Thank you.
