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 4E9C510505 for ; Wed, 19 Jun 2013 15:35:49 +0000 (UTC) Received: (qmail 69551 invoked by uid 500); 19 Jun 2013 15:35:48 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 69532 invoked by uid 500); 19 Jun 2013 15:35:48 -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 69520 invoked by uid 99); 19 Jun 2013 15:35:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Jun 2013 15:35:47 +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; Wed, 19 Jun 2013 15:35:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 04E9923889F1; Wed, 19 Jun 2013 15:35:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn propchange: r1494657 - svn:log Date: Wed, 19 Jun 2013 15:35:24 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130619153525.04E9923889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stsp Revision: 1494657 Modified property: svn:log Modified: svn:log at Wed Jun 19 15:35:24 2013 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Wed Jun 19 15:35:24 2013 @@ -3,5 +3,5 @@ Remove duplicate invocations of the conf * subversion/libsvn_wc/update_editor.c (mark_directory_edited, mark_file_edited): Don't invoke the conflict resolver here, the close_file() and close_directory() functions take - care of this as of r1491868. + care of this already.