Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 348F0200BC7 for ; Fri, 25 Nov 2016 12:01:07 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 33197160B01; Fri, 25 Nov 2016 11:01:07 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7F7BD160AF6 for ; Fri, 25 Nov 2016 12:01:06 +0100 (CET) Received: (qmail 97657 invoked by uid 500); 25 Nov 2016 11:01:05 -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 97641 invoked by uid 99); 25 Nov 2016 11:01:05 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Nov 2016 11:01:05 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 37FF0C0336 for ; Fri, 25 Nov 2016 11:01:05 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id M5VLwGEl0Jec for ; Fri, 25 Nov 2016 11:01:04 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 65BB65F4A9 for ; Fri, 25 Nov 2016 11:01:04 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id D68D8E0045 for ; Fri, 25 Nov 2016 11:01:03 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id D5DB63A0254 for ; Fri, 25 Nov 2016 11:01:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1771281 - /subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Date: Fri, 25 Nov 2016 11:01:03 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161125110103.D5DB63A0254@svn01-us-west.apache.org> archived-at: Fri, 25 Nov 2016 11:01:07 -0000 Author: stsp Date: Fri Nov 25 11:01:03 2016 New Revision: 1771281 URL: http://svn.apache.org/viewvc?rev=1771281&view=rev Log: * subversion/libsvn_wc/wc_db_update_move.c (update_incoming_moved_node): Improve docstring. (update_incoming_move): Fix formatting of a comment. Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1771281&r1=1771280&r2=1771281&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Fri Nov 25 11:01:03 2016 @@ -2063,8 +2063,8 @@ get_working_info(apr_hash_t **props, return SVN_NO_ERROR; } -/* ### Drive TC_EDITOR so as to ... - */ +/* Apply changes found in the victim node at SRC_RELPATH to the incoming + * move at DST_RELPATH. */ static svn_error_t * update_incoming_moved_node(node_move_baton_t *nmb, svn_wc__db_wcroot_t *wcroot, @@ -2305,7 +2305,7 @@ update_incoming_move(svn_revnum_t *old_r /* We walk the move source, comparing each node with the equivalent node at * the move destination and applying any local changes to nodes at the move - destination. */ + * destination. */ SVN_ERR(update_incoming_moved_node(&nmb, wcroot, local_relpath, dst_relpath, scratch_pool));