From users-return-1148-daniel=haxx.se@subversion.apache.org Mon Feb 22 19:35:57 2010 Return-Path: Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by giant.haxx.se (8.14.3/8.14.3/Debian-9) with SMTP id o1MIZu5i031921 for ; Mon, 22 Feb 2010 19:35:57 +0100 Received: (qmail 8632 invoked by uid 500); 22 Feb 2010 18:35:51 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 8624 invoked by uid 99); 22 Feb 2010 18:35:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Feb 2010 18:35:51 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of markphip@gmail.com designates 209.85.222.194 as permitted sender) Received: from [209.85.222.194] (HELO mail-pz0-f194.google.com) (209.85.222.194) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Feb 2010 18:35:44 +0000 Received: by pzk32 with SMTP id 32so173892pzk.4 for ; Mon, 22 Feb 2010 10:35:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=M4/3WPEDUJmaLITwkc8smSzGxxPr3vcOB2Dun1c7140=; b=mzlPTWH1VZvZ+7Fg03q5Rp3NnGL6j4ceqi1N2N8ObN6cgWNMOIL1F3l/moigBmRAjW 0nvwBLTdReu5fiTRDllot+tJKxXmXYyyD2U6aIMCSv+i/zGB9fovT8vqBUzwIbDJZ17H julx24tUCyz6LodNvXXmNkx1TgRN7GaPqrxRI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=ekcVllJVUyYM4sB7fcYhbKPqHfI3g/Cmt4nAAmM5dAMTi2cxkgxr1WC2biPyBTukmr D162mMjBzjNCCpLxhDGn1urF0lTNsFw2itEi4djFDhHZmijuV6AwAPqS/0ArPbjGEzlZ KxD8lbhJnGA4at/LDUcPuUoCukWu/PQCvaQns= MIME-Version: 1.0 Received: by 10.142.61.40 with SMTP id j40mr5256828wfa.115.1266863724433; Mon, 22 Feb 2010 10:35:24 -0800 (PST) In-Reply-To: References: Date: Mon, 22 Feb 2010 10:35:24 -0800 Message-ID: Subject: Re: Strange output from reintegrate merge using JavaHL From: Mark Phippard To: Jacob Weber Cc: users@subversion.apache.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable JavaHL itself does not output anything. It just sends notifications and the code using JavaHL (svnClientAdapter in this case) turns it into something. Your output means that a notification came out of SVN that the svnClientAdapter code did not have code to handle. The best thing would be to put the JhlNotificationHandler class in debug and run the same merge and let us know what the unexpected values are so that we can handle it. On Sun, Feb 21, 2010 at 12:54 PM, Jacob Weber wrote: > Sometimes when I do a --reintegrate merge, I get some unexpected output, = along with the normal updates: > > =A0 =A0--- Merging differences between repository URLs into trunk-path > =A0 =A0U =A0 /trunk-path/file1 > =A0 =A0U =A0 trunk-path/file2 > =A0 =A0 =A0 =A0trunk-path/file3 > =A0 =A0 =A0 =A0trunk-path/fil4 > ... > > That is, I see a bunch of filenames that have no status indicator. There = were hundreds of them in my latest merge. > > I'm using a Subversion 1.6.5 client, through Subclipse, using the JavaHL = interface, connecting to a 1.6.5 server. > > This output seems to be the result of a call to: > org.tigris.subversion.javahl.mergeReintegrate(branch-url, HEAD, trunk-pat= h, false). > > Does anyone know why this might happen? Thanks, > Jacob --=20 Thanks Mark Phippard http://markphip.blogspot.com/