Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A09099B60 for ; Tue, 7 Feb 2012 18:21:28 +0000 (UTC) Received: (qmail 5318 invoked by uid 500); 7 Feb 2012 18:21:28 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 5260 invoked by uid 500); 7 Feb 2012 18:21:27 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 5252 invoked by uid 99); 7 Feb 2012 18:21:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Feb 2012 18:21:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Feb 2012 18:21:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B113F23888E4 for ; Tue, 7 Feb 2012 18:21:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1241540 - /subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c Date: Tue, 07 Feb 2012 18:21:04 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120207182104.B113F23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stsp Date: Tue Feb 7 18:21:04 2012 New Revision: 1241540 URL: http://svn.apache.org/viewvc?rev=1241540&view=rev Log: On the moves-scan-log branch: * subversion/libsvn_wc/update_editor.c (delete_entry): Add empty placeholders for the following tree conflict resolution cases (none implemented yet): o incoming move vs. local move, choose incoming o incoming move vs. local move, choose local o incoming move vs. local delete, choose incoming o incoming move vs. local delete, choose local Modified: subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c Modified: subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c?rev=1241540&r1=1241539&r2=1241540&view=diff ============================================================================== --- subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c (original) +++ subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c Tue Feb 7 18:21:04 2012 @@ -2275,13 +2275,33 @@ delete_entry(const char *path, break; } - if (result->choice == svn_wc_conflict_choose_mine_conflict) + if (tree_conflict->reason == svn_wc_conflict_reason_moved_away && + tree_conflict->action == svn_wc_conflict_action_move_away && + result->choice == svn_wc_conflict_choose_mine_conflict) { /* ### TODO */ break; } - if (result->choice == svn_wc_conflict_choose_theirs_conflict) + if (tree_conflict->reason == svn_wc_conflict_reason_moved_away && + tree_conflict->action == svn_wc_conflict_action_move_away && + result->choice == svn_wc_conflict_choose_theirs_conflict) + { + /* ### TODO */ + break; + } + + if (tree_conflict->reason == svn_wc_conflict_reason_deleted && + tree_conflict->action == svn_wc_conflict_action_move_away && + result->choice == svn_wc_conflict_choose_mine_conflict) + { + /* ### TODO */ + break; + } + + if (tree_conflict->reason == svn_wc_conflict_reason_deleted && + tree_conflict->action == svn_wc_conflict_action_move_away && + result->choice == svn_wc_conflict_choose_theirs_conflict) { /* ### TODO */ break;