Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: softfail (nike.apache.org: transitioning domain of
 btv1==4419d0be70b==DReed@cmal.com does not designate 72.166.44.29 as
 permitted sender)
From: "Reed, David" <DReed@CMAL.com>
To: 'Les Mikesell' <lesmikesell@gmail.com>
CC: Andy Levy <andy.levy@gmail.com>, "users@subversion.apache.org"
	<users@subversion.apache.org>
Subject: RE: Update fails to delete a line of code
Thread-Topic: Update fails to delete a line of code
Thread-Index: 
 Ac0SkgPK1qM4gUVvSkmVnGquKg/8QAAI0Q2AAAhSryD//80yAIAAQMgA///FuwCAAEMPwA==
Date: Wed, 4 Apr 2012 20:11:21 +0000
Message-ID: 
 <1FF4EEEE6CA0C641848F6412E887CE022C4B5477@EXCHMB02.cmrgcorp.cmrginc.com>
References: 
 <1FF4EEEE6CA0C641848F6412E887CE022C4B52F0@EXCHMB02.cmrgcorp.cmrginc.com>
	<CALb=wnmZvQMuwXnc102TXTAPC1w7nGtuYdcukHUej0qB4yaE6A@mail.gmail.com>
	<1FF4EEEE6CA0C641848F6412E887CE022C4B5358@EXCHMB02.cmrgcorp.cmrginc.com>
	<CAOAgVpw0+HcCoAbDnht6w_MuqwBLfNsYQv6Q15LpCNKmoaBG_w@mail.gmail.com>
	<1FF4EEEE6CA0C641848F6412E887CE022C4B5445@EXCHMB02.cmrgcorp.cmrginc.com>
 <CAOAgVpyF9r+KF4uk+WNXahvaEESMTHQUsq8rBKKJVMP=K0GrzA@mail.gmail.com>
In-Reply-To: 
 <CAOAgVpyF9r+KF4uk+WNXahvaEESMTHQUsq8rBKKJVMP=K0GrzA@mail.gmail.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Thank you, very much, for your help.

-----Original Message-----
From: Les Mikesell [mailto:lesmikesell@gmail.com]
Sent: Wednesday, April 04, 2012 4:10 PM
To: Reed, David
Cc: Andy Levy; users@subversion.apache.org
Subject: Re: Update fails to delete a line of code

On Wed, Apr 4, 2012 at 2:59 PM, Reed, David <DReed@cmal.com> 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 n=
o 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 apologie=
s!

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
     lesmikesell@gmail.com
Confidentiality Note: This e-mail, and any attachment to it, contains privi=
leged and confidential information intended only for the use of the individ=
ual(s) or entity named on the e-mail. If the reader of this e-mail is not t=
he intended recipient, or the employee or agent responsible for delivering =
it to the intended recipient, you are hereby notified that reading it is st=
rictly prohibited. If you have received this e-mail in error, please immedi=
ately return it to the sender and delete it from your system. Thank you.