From users-return-18453-apmail-subversion-users-archive=subversion.apache.org@subversion.apache.org Sun Jun 23 23:21:17 2013 Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 58CD2CD65 for ; Sun, 23 Jun 2013 23:21:17 +0000 (UTC) Received: (qmail 71867 invoked by uid 500); 23 Jun 2013 23:21:16 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 71846 invoked by uid 500); 23 Jun 2013 23:21:16 -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 71839 invoked by uid 99); 23 Jun 2013 23:21:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Jun 2013 23:21:16 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of nkadel@gmail.com designates 209.85.215.52 as permitted sender) Received: from [209.85.215.52] (HELO mail-la0-f52.google.com) (209.85.215.52) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Jun 2013 23:21:11 +0000 Received: by mail-la0-f52.google.com with SMTP id fo12so9548979lab.39 for ; Sun, 23 Jun 2013 16:20:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=cCDnTCVxovxlDqFLNSj9waFcSZ5LTdngdM1P9u+nH3Y=; b=rVUzuAhs3XYY1LexMi2VTvS+sd4H1hSW1bhL3/nUQ1lA4UFB6Hmskvx0MSHa1LmHwR jZr/SvE0cA+kQbl9ratik7CeqMhCzaqCujRghVGrnqBxgK6aPC8resCPtGfhvk7gWwlU WSTfSNQss2QR1PnCTiZvN4wkmNA/IudXVN33S9nvmEplQxBUpMMAuMU6/JR0wOV5DzVr zpgtvA0Z3ATkAqJ5DuojRBuxRQz0rYXygcsywSyDZDi85h1cmLdsfXwM+W3zXWg6ST66 cQydLEjnmZ1MV5V9F5l+dizH5GVrr05+t2Tky4IWf21Al5cvoApO8OS1GUG7TS4K6it6 /vXQ== MIME-Version: 1.0 X-Received: by 10.112.125.199 with SMTP id ms7mr11667017lbb.29.1372029650817; Sun, 23 Jun 2013 16:20:50 -0700 (PDT) Received: by 10.112.140.130 with HTTP; Sun, 23 Jun 2013 16:20:50 -0700 (PDT) In-Reply-To: <9665187.7FSStEo8v1@mistral> References: <9665187.7FSStEo8v1@mistral> Date: Sun, 23 Jun 2013 19:20:50 -0400 Message-ID: Subject: Re: Merge error with SVN 1.8.0 From: Nico Kadel-Garcia To: Alexey Neyman Cc: users@subversion.apache.org Content-Type: text/plain; charset=ISO-8859-1 X-Virus-Checked: Checked by ClamAV on apache.org On Sun, Jun 23, 2013 at 3:56 PM, Alexey Neyman wrote: > Hi, > > > > I've tried upgrading the client to SVN 1.8, and now see some strange merge > errors while reintegrating the branch. According to Did you delete the old RHEL 1.6.11 RPM, to avoid libraries lying around and confusing you? Or binaries turning up in your "commit" scripts due to inherited "PATH" that does not include the new version? To avoid the fun and games, I urge you to grab and test my newly minted Subversion 1.8.0 RPM building tools, at: https://github.com/nkadel/subversion-1.8.x-srpm I've also bundled a libserf SRPM building toolkit at: https://github.com/nkadel/libserf-1.2.x-srpm I've been testing out the 1.8.x features, it's suitable for pushing to Rpmforge. EPEL would take a lot more work because there are key libraries, like "SQLite", that have to be compiled locally even for RHEL 6. And Fedora 19, which is coming out, does not use SysV init scripts at all, it uses system, so the "svnserve" init script will be rejected out of hand. > > > > http://subversion.apache.org/docs/release-notes/1.8.html#auto-reintegrate > > > > the --reintegrate option is now deprecated, its use is discouraged and SVN > should be able to figure that out automatically. However, when I tried a > plain "svn merge", it gave me the following error: > > > > [aneyman@build2 trunk]$ svn merge ^/MERGE-PATH > > svn: E210002: Unable to connect to a repository at URL 'svn://MERGE-URL' > > svn: E210002: Network connection closed unexpectedly > > > > Strangely, 'svn merge --reintegrate' worked fine. > > > > We are running 1.6.11 on the server (stock RedHat RPM, "1.6.11-2.el6_1.4" > version). I installed SVN 1.8.0 RPM from WanDisco ("1.8.0-1") on the client. > > > > Any clues/suggestions as to how to debug this further? > > > > Regards, > > Alexey.