Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9C3ED200AF6 for ; Sat, 11 Jun 2016 16:37:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9AEA1160A54; Sat, 11 Jun 2016 14:37:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E1B6F160A2B for ; Sat, 11 Jun 2016 16:37:21 +0200 (CEST) Received: (qmail 2907 invoked by uid 500); 11 Jun 2016 14:37:21 -0000 Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@subversion.apache.org Received: (qmail 2894 invoked by uid 99); 11 Jun 2016 14:37:20 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Jun 2016 14:37:20 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 5DE781A002B for ; Sat, 11 Jun 2016 14:37:20 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.198 X-Spam-Level: * X-Spam-Status: No, score=1.198 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HTML_MESSAGE=2, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd2-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 42yAch_ajk1K for ; Sat, 11 Jun 2016 14:37:18 +0000 (UTC) Received: from mail-qk0-f171.google.com (mail-qk0-f171.google.com [209.85.220.171]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTPS id 4275C5FAEA for ; Sat, 11 Jun 2016 14:37:17 +0000 (UTC) Received: by mail-qk0-f171.google.com with SMTP id c73so25134195qkg.2 for ; Sat, 11 Jun 2016 07:37:17 -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; bh=TfsyfWRs3ta/x3RqMhaWCjAu4kwKX115cRBJquuTuTc=; b=Mffk9MaVmc+eTPi8y/JsAN5eOG1pwx249Iy6UZ2dspbhRby7yxs1cSGM+jI2v+4kj/ Lgq0PZxkYoDERM7d7QEK1jf6NSGYvAddd/VDfdDMxajZq5r5S4fWfN76pgPw7oXi0ohe iIY5lSgdtoVNo1dGYSq/CBCVeAtM+IGQgYsdsQ/4urCVTTiZixiJeK08rGafm713dCFe 2Ea9Z625GJPlTwvkNMd2LDGxluT6NGjfinYRIW5olr18b5g0qEqqoY1CtlbfVu5GfQpw u7ab4cSIYWjOzrjO0jdRpfK06LvRYyg5NHKB3XlvvTGergEUCYNblen/MPboVxK6wqpR rMgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc; bh=TfsyfWRs3ta/x3RqMhaWCjAu4kwKX115cRBJquuTuTc=; b=JQHJ6xnw1K8Ivu7sEtUVw2BMUcXhmHqNVNwpANRijqnTsM4LXyoxqSX2UtbpOUFqIU rwTcrbGP6Qg7FxhRJOwxnw1XpvBhFwlHVf8IHuCRsZpuTyTl1/jq3WhHyf2jq1mQC4um Hf5oUnZfy4BkfU0tLHc7kQREJ6eLl0e1OCI0/PBYUzIpjbukjXP/xTJeSmKG5VWE+rm/ 0xAo0Iwp9Vof5dbROrLYRWO8kuimFIchLoLUH6cqINKmLNeSHS228WXWw1/HhW1mgdUZ F/MaCgNh+5v0QeVgzF+ClTgGWv3T9tg6fFG2t/mQdps2/UMJqM6sB/2JpJtPp2893w1u Famg== X-Gm-Message-State: ALyK8tJiFBG5Sxuik4bvYWWlbMFt1BfoTyZzT9ddCgP4MHtDiFpvUDqebQVNalVav+4VfBgdRk9nPfRqU0gtPA== MIME-Version: 1.0 X-Received: by 10.55.147.196 with SMTP id v187mr6679993qkd.7.1465655837014; Sat, 11 Jun 2016 07:37:17 -0700 (PDT) Received: by 10.55.210.67 with HTTP; Sat, 11 Jun 2016 07:37:16 -0700 (PDT) Received: by 10.55.210.67 with HTTP; Sat, 11 Jun 2016 07:37:16 -0700 (PDT) In-Reply-To: References: Date: Sat, 11 Jun 2016 16:37:16 +0200 Message-ID: Subject: Re: SVN-4635: Cherry-pick merge scenario causes Svn to choke From: Johan Corveleyn To: Paul Hammant Cc: Subversion Development Content-Type: multipart/alternative; boundary=94eb2c07df1e87437505350197b4 archived-at: Sat, 11 Jun 2016 14:37:22 -0000 --94eb2c07df1e87437505350197b4 Content-Type: text/plain; charset=UTF-8 Op 11-jun.-2016 12:37 schreef "Paul Hammant" : > > http://subversion.apache.org/docs/community-guide/issues.html amongst other things, says " > if you're pretty sure about the bug, go ahead and post directly to our development list". OK, so here's a bug with merge tracking: > > https://issues.apache.org/jira/browse/SVN-4635 > > Synopsis: Series of cherry-picks between branches breaks subversions merge tracking > > A reproducible bug, I should say - there's bash scripts within the issue. made on a mac and tested with Svn 1.9.4. > > I even ported the same scripts to Perforce, Git and Mercurial (same sequence of merge events) and it > works fine. The code for those is on branches in that same Git repo. > Hi Paul, Thank you for reporting this issue, with reproduction script and all. It's fine that you try to draw a little attention to it with your post to dev@. However, at this time resources are quite low in our little dev community, so I'm not sure when someone will be able to take a closer look. Patches are always welcome of course :-), but I know that not everyone has the time to go that route ... Regardless, thanks for the issue report. -- Johan --94eb2c07df1e87437505350197b4 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

Op 11-jun.-2016 12:37 schreef "Paul Hammant" <<= a href=3D"mailto:paul@hammant.org">paul@hammant.org>:
>
> http://subversion.apache.org/docs/community-guide/issues.html among= st other things, says "
> if you're pretty sure about the bug, go ahead and post directly to= our development list". OK, so here's a bug with merge tracking: >
> =C2=A0 =C2=A0https://issues.apache.org/jira/browse/SVN-4635
>
> =C2=A0 =C2=A0Synopsis: Series of cherry-picks between branches breaks = subversions merge tracking
>
> A reproducible bug, I should say - there's bash scripts within the= issue. made on a mac and tested with Svn 1.9.4.
>
> I even ported the same scripts to Perforce, Git and Mercurial (same se= quence of merge events) and it
> works fine. The code for those is on branches in that same Git repo. <= br> >

Hi Paul,

Thank you for reporting this issue, with reproduction script= and all.

It's fine that you try to draw a little attention to it = with your post to dev@. However, at this time resources are quite low in ou= r little dev community, so I'm not sure when someone will be able to ta= ke a closer look.

Patches are always welcome of course :-), but I know that no= t everyone has the time to go that route ...

Regardless, thanks for the issue report.

--
Johan

--94eb2c07df1e87437505350197b4--