You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by "Reed, David" <DR...@CMAL.com> on 2012/04/04 20:38:34 UTC
Update fails to delete a line of code
I am not subscribed, so please be so kind as to CC me in your response. Thanks.
Using relatively current versions of SubversionEdge and TortoiseSVN, I "committed" a file (from which I had deleted a line of code in my local workspace).
Then I logged onto my app server and used TortoiseSVN and "updated" the same file.
I was surprised to see that, instead of replacing the file on the app server with the latest revision, a merge was performed automatically. Without asking me, the file on the app server was merged with the version I had committed to the repository, and this merge resulted in *no change* to the copy on the app server -- since the merge kept in place the line of code I was trying to delete.
Obviously, this was not the desired result. What should I do differently, so that committing a file with a line deleted, and then updating the same file on a second machine, will result in the file on the second machine reflecting the deletion?
Thanks,
Dave
David Reed
Casual Male Retail Group, Inc.
555 Turnpike Street
Canton, MA 02021
dreed@cmal.com<ma...@cmal.com>
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.
RE: Update fails to delete a line of code
Posted by "Reed, David" <DR...@CMAL.com>.
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 <DR...@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 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
lesmikesell@gmail.com
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.
Re: Update fails to delete a line of code
Posted by Les Mikesell <le...@gmail.com>.
On Wed, Apr 4, 2012 at 2:59 PM, Reed, David <DR...@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 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
lesmikesell@gmail.com
RE: Update fails to delete a line of code
Posted by "Reed, David" <DR...@CMAL.com>.
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!
Thanks,
Dave
-----Original Message-----
From: Les Mikesell [mailto:lesmikesell@gmail.com]
Sent: Wednesday, April 04, 2012 3:47 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 1:53 PM, Reed, David <DR...@cmal.com> wrote:
> No, it was identical to the local file, except for the deleted line of code.
That doesn't make much sense. Does the tortoise 'check for
modifications' against the repository show they are different?
--
Les Mikesell
lesmikesell@gmail.com
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.
Re: Update fails to delete a line of code
Posted by Les Mikesell <le...@gmail.com>.
On Wed, Apr 4, 2012 at 1:53 PM, Reed, David <DR...@cmal.com> wrote:
> No, it was identical to the local file, except for the deleted line of code.
That doesn't make much sense. Does the tortoise 'check for
modifications' against the repository show they are different?
--
Les Mikesell
lesmikesell@gmail.com
RE: Update fails to delete a line of code
Posted by "Reed, David" <DR...@CMAL.com>.
No, it was identical to the local file, except for the deleted line of code.
-----Original Message-----
From: Andy Levy [mailto:andy.levy@gmail.com]
Sent: Wednesday, April 04, 2012 2:50 PM
To: Reed, David
Cc: users@subversion.apache.org
Subject: Re: Update fails to delete a line of code
On Wed, Apr 4, 2012 at 14:38, Reed, David <DR...@cmal.com> wrote:
> I am not subscribed, so please be so kind as to CC me in your response.
> Thanks.
>
>
>
> Using relatively current versions of SubversionEdge and TortoiseSVN, I
> "committed" a file (from which I had deleted a line of code in my
> local workspace).
>
>
>
> Then I logged onto my app server and used TortoiseSVN and "updated"
> the same file.
>
>
>
> I was surprised to see that, instead of replacing the file on the app
> server with the latest revision, a merge was performed automatically.
> Without asking me, the file on the app server was merged with the
> version I had committed to the repository, and this merge resulted in
> *no change* to the copy on the app server -- since the merge kept in
> place the line of code I was trying to delete.
>
>
>
> Obviously, this was not the desired result. What should I do
> differently, so that committing a file with a line deleted, and then
> updating the same file on a second machine, will result in the file on
> the second machine reflecting the deletion?
Did the file on your app server have any uncommitted changes in it?
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.
Re: Update fails to delete a line of code
Posted by Andy Levy <an...@gmail.com>.
On Wed, Apr 4, 2012 at 14:38, Reed, David <DR...@cmal.com> wrote:
> I am not subscribed, so please be so kind as to CC me in your response.
> Thanks.
>
>
>
> Using relatively current versions of SubversionEdge and TortoiseSVN, I
> "committed" a file (from which I had deleted a line of code in my local
> workspace).
>
>
>
> Then I logged onto my app server and used TortoiseSVN and "updated" the same
> file.
>
>
>
> I was surprised to see that, instead of replacing the file on the app server
> with the latest revision, a merge was performed automatically. Without
> asking me, the file on the app server was merged with the version I had
> committed to the repository, and this merge resulted in *no change* to the
> copy on the app server -- since the merge kept in place the line of code I
> was trying to delete.
>
>
>
> Obviously, this was not the desired result. What should I do differently,
> so that committing a file with a line deleted, and then updating the same
> file on a second machine, will result in the file on the second machine
> reflecting the deletion?
Did the file on your app server have any uncommitted changes in it?