Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A0A1D9E15 for ; Wed, 4 Apr 2012 18:46:32 +0000 (UTC) Received: (qmail 71024 invoked by uid 500); 4 Apr 2012 18:46:31 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 70995 invoked by uid 500); 4 Apr 2012 18:46:31 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Delivered-To: moderator for users@subversion.apache.org Received: (qmail 42877 invoked by uid 99); 4 Apr 2012 18:39:03 -0000 X-ASF-Spam-Status: No, hits=3.2 required=5.0 tests=HTML_MESSAGE,SPF_SOFTFAIL X-Spam-Check-By: apache.org Received-SPF: softfail (nike.apache.org: transitioning domain of btv1==4419d0be70b==DReed@cmal.com does not designate 72.166.44.29 as permitted sender) X-ASG-Debug-ID: 1333564715-304301ac0000-bBppbA X-Barracuda-URL: http://192.168.12.12:8000/cgi-bin/mark.cgi X-ASG-Whitelist: Client From: "Reed, David" To: "'users@subversion.apache.org'" CC: "Reed, David" X-ASG-Orig-Subj: Update fails to delete a line of code Subject: Update fails to delete a line of code Thread-Topic: Update fails to delete a line of code Thread-Index: Ac0SkgPK1qM4gUVvSkmVnGquKg/8QA== Date: Wed, 4 Apr 2012 18:38:34 +0000 Message-ID: <1FF4EEEE6CA0C641848F6412E887CE022C4B52F0@EXCHMB02.cmrgcorp.cmrginc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.168.18.41] Content-Type: multipart/alternative; boundary="_000_1FF4EEEE6CA0C641848F6412E887CE022C4B52F0EXCHMB02cmrgcor_" MIME-Version: 1.0 X-Barracuda-Connect: UNKNOWN[192.168.12.160] X-Barracuda-Start-Time: 1333564716 X-Barracuda-Virus-Scanned: by OUTBOUND SPAM FIREWALL at cmal.com --_000_1FF4EEEE6CA0C641848F6412E887CE022C4B52F0EXCHMB02cmrgcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable I am not subscribed, so please be so kind as to CC me in your response. Th= anks. Using relatively current versions of SubversionEdge and TortoiseSVN, I "com= mitted" a file (from which I had deleted a line of code in my local workspa= ce). Then I logged onto my app server and used TortoiseSVN and "updated" the sam= e file. I was surprised to see that, instead of replacing the file on the app serve= r with the latest revision, a merge was performed automatically. Without a= sking me, the file on the app server was merged with the version I had comm= itted 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 f= ile on a second machine, will result in the file on the second machine refl= ecting the deletion? Thanks, Dave David Reed Casual Male Retail Group, Inc. 555 Turnpike Street Canton, MA 02021 dreed@cmal.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. --_000_1FF4EEEE6CA0C641848F6412E887CE022C4B52F0EXCHMB02cmrgcor_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

I am not subscribed, so please be so kind as to CC m= e 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 TortoiseSV= N and "updated" the same file.

 

I was surprised to see that, instead of replacing th= e file on the app server with the latest revision, a merge was performed au= tomatically.  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 de= lete.

 

Obviously, this was not the desired result.  Wh= at 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 fil= e on the second machine reflecting the deletion?

 

Thanks,

Dave

 

David Reed

Casual Male Retail Group, Inc.

555 Turnpike Street   

Canton, MA  02021   &= nbsp; 

dreed@cmal.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 strictly prohibited. If you have receive= d this e-mail in error, please immediately return it to the sender and dele= te it from your system. Thank you. --_000_1FF4EEEE6CA0C641848F6412E887CE022C4B52F0EXCHMB02cmrgcor_--