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 5D9CE7422 for ; Fri, 28 Oct 2011 11:56:47 +0000 (UTC) Received: (qmail 58549 invoked by uid 500); 28 Oct 2011 11:56:47 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 58530 invoked by uid 500); 28 Oct 2011 11:56:47 -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 58523 invoked by uid 99); 28 Oct 2011 11:56:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2011 11:56: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.131] (HELO eos.apache.org) (140.211.11.131) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2011 11:56:44 +0000 Received: from eos.apache.org (localhost [127.0.0.1]) by eos.apache.org (Postfix) with ESMTP id EAE17EC0 for ; Fri, 28 Oct 2011 11:56:23 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Apache Wiki To: Apache Wiki Date: Fri, 28 Oct 2011 11:56:23 -0000 Message-ID: <20111028115623.97620.73824@eos.apache.org> Subject: =?utf-8?q?=5BSubversion_Wiki=5D_Update_of_=22MergeBugsAndErrorReporting?= =?utf-8?q?=22_by_JulianFoad?= Auto-Submitted: auto-generated X-Virus-Checked: Checked by ClamAV on apache.org Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" fo= r change notification. The "MergeBugsAndErrorReporting" page has been changed by JulianFoad: http://wiki.apache.org/subversion/MergeBugsAndErrorReporting?action=3Ddiff&= rev1=3D3&rev2=3D4 Simple bugs, and enhancements to error reporting. = - * This error needs a higher-level message: + * These errors needs a higher-level message: = {{{ $ svn merge -r1181882:1177606 ^/trunk - /home/.../subversion/svn/util.c:913: (apr_err=3D160013) + /.../subversion/svn/util.c:913: (apr_err=3D160013) - /home/.../subversion/libsvn_client/merge.c:11057: (apr_err=3D160013) + /.../subversion/libsvn_client/merge.c:11057: (apr_err=3D160013) - /home/.../subversion/libsvn_client/merge.c:11011: (apr_err=3D160013) + /.../subversion/libsvn_client/merge.c:11011: (apr_err=3D160013) - /home/.../subversion/libsvn_client/merge.c:11011: (apr_err=3D160013) + /.../subversion/libsvn_client/merge.c:11011: (apr_err=3D160013) - /home/.../subversion/libsvn_client/merge.c:10959: (apr_err=3D160013) + /.../subversion/libsvn_client/merge.c:10959: (apr_err=3D160013) - /home/.../subversion/libsvn_client/merge.c:6532: (apr_err=3D160013) + /.../subversion/libsvn_client/merge.c:6532: (apr_err=3D160013) - /home/.../subversion/libsvn_client/ra.c:611: (apr_err=3D160013) + /.../subversion/libsvn_client/ra.c:611: (apr_err=3D160013) - /home/.../subversion/libsvn_ra_serf/getlocationsegments.c:247: (apr_err= =3D160013) + /.../subversion/libsvn_ra_serf/getlocationsegments.c:247: (apr_err=3D1600= 13) - /home/.../subversion/libsvn_ra_serf/util.c:2462: (apr_err=3D160013) + /.../subversion/libsvn_ra_serf/util.c:2462: (apr_err=3D160013) svn: E160013: '/repos/asf/!svn/bc/1182329/trunk' path not found + = + $ svn merge --dry-run ../subversion-g/@1100000 + /.../subversion/svn/util.c:913: (apr_err=3D160013) + /.../subversion/libsvn_client/merge.c:11038: (apr_err=3D160013) + /.../subversion/libsvn_client/merge.c:10990: (apr_err=3D160013) + /.../subversion/libsvn_client/merge.c:10938: (apr_err=3D160013) + /.../subversion/libsvn_client/merge.c:6521: (apr_err=3D160013) + /.../subversion/libsvn_client/ra.c:580: (apr_err=3D160013) + /.../subversion/libsvn_ra_serf/getlocationsegments.c:247: (apr_err=3D1600= 13) + /.../subversion/libsvn_ra_serf/util.c:2455: (apr_err=3D160013) + svn: E160013: '/repos/asf/!svn/rvr/1100000/subversion/branches/showing-me= rge-info' path not found }}} = * The message about recording mergeinfo at the end of a catch-up merge s= eems to report the wrong starting revision: