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 2225F11AC1 for ; Thu, 14 Aug 2014 13:16:57 +0000 (UTC) Received: (qmail 51388 invoked by uid 500); 14 Aug 2014 13:16:57 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 51360 invoked by uid 500); 14 Aug 2014 13:16:56 -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 51349 invoked by uid 99); 14 Aug 2014 13:16:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Aug 2014 13:16:56 +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; Thu, 14 Aug 2014 13:16:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 764AF2388831; Thu, 14 Aug 2014 13:16:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn propchange: r1617909 - svn:log Date: Thu, 14 Aug 2014 13:16:33 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140814131633.764AF2388831@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stsp Revision: 1617909 Modified property: svn:log Modified: svn:log at Thu Aug 14 13:16:33 2014 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Thu Aug 14 13:16:33 2014 @@ -1,3 +1,8 @@ +[ + Note from the future: + Reverted in r1617930; see r1617932 for a better fix +] + Record the update/switch target revision for missing tree conflicts victims in the tree conflict description so the revision can always be retrieved during conflict resolution.