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 5EE807DC5 for ; Fri, 25 Nov 2011 12:55:48 +0000 (UTC) Received: (qmail 72625 invoked by uid 500); 25 Nov 2011 12:55:48 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 72606 invoked by uid 500); 25 Nov 2011 12:55: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 72587 invoked by uid 99); 25 Nov 2011 12:55:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Nov 2011 12:55:48 +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; Fri, 25 Nov 2011 12:55:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C77C623889C5 for ; Fri, 25 Nov 2011 12:55:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn propchange: r1206136 - svn:log Date: Fri, 25 Nov 2011 12:55:24 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111125125524.C77C623889C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stsp Revision: 1206136 Modified property: svn:log Modified: svn:log at Fri Nov 25 12:55:24 2011 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Fri Nov 25 12:55:24 2011 @@ -1,5 +1,5 @@ On the moves-scan-log branch, allow the heuristic to consider multiple move -destinations for same deleted node. The user will have to resolve ambiguity. +destinations for one deleted node. The user will have to resolve ambiguity. For example, in situations such as: r4: @@ -11,7 +11,7 @@ the user can tell svn to interpret one o as a move and treat the remaining copies as normal copies. Note that the conflict callback implementation already supports this scenario. -But until now the library never returned more than on move suggestion. +But until now the library never returned more than one move suggestion. * subversion/libsvn_wc/update_editor.c (find_applicable_moves): Don't stop processing moves from a single revision