From users-return-27039-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Fri Apr 13 14:50:18 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 98E63180627 for ; Fri, 13 Apr 2018 14:50:17 +0200 (CEST) Received: (qmail 54251 invoked by uid 500); 13 Apr 2018 12:50: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 54237 invoked by uid 99); 13 Apr 2018 12:50:15 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Apr 2018 12:50:15 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 34938180543 for ; Fri, 13 Apr 2018 12:50:15 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.102 X-Spam-Level: X-Spam-Status: No, score=-0.102 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd3-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id L8Zv8gPRb1NL for ; Fri, 13 Apr 2018 12:50:14 +0000 (UTC) Received: from mail-ua0-f175.google.com (mail-ua0-f175.google.com [209.85.217.175]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTPS id 7E6A75F5B2 for ; Fri, 13 Apr 2018 12:50:13 +0000 (UTC) Received: by mail-ua0-f175.google.com with SMTP id q26so5692521uab.0 for ; Fri, 13 Apr 2018 05:50:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=XYDTDWWbPmedgJk//y98cRzt9cD5vPUajD7fFjOeO9U=; b=gVktBZdmGbJM07bygY+AeJI+aJBq+svx0T0eV4QueT49u3VLtpd1muUMe6O11uwSS9 S90aN4QBOgxRTsF8ixkgsqA4ZsXwKvYluzJX88tee7/wxbUTvTWwPKT5ULTD8J1ykXzR A/6LuK/EX/2dx604D9q46Z8Gt5Ob74Opjh+eQD1sjoxpDLxA/GqoNP42Avbq8Td6c/+j 0zPFQG0aBYql1bP8VyLGM2+vZu+cr3SVCjjuKaN80vBoNW6cj+tWwFfn+Aq1rdFcmGM+ IV97d37F9k6a7nsty1K8FxEF59ru5+EOgYSvBF81fd+iG12fUDruB0RuRiEwvqo784yl y1FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=XYDTDWWbPmedgJk//y98cRzt9cD5vPUajD7fFjOeO9U=; b=iLqbbfUzr+FZFAPktyCZIimr+eRlZIa1GS/2ZWD2MZFwVxSvjh6GaDOtTZfimTZYYz 51gHAjV2Vou2ZdvIU/GaXwHfnPXl6J1YrJVqqbxrjKbt7IIQ8mrVqr3b7+hRdu2JyyzE PHPgCX9Gi0u3zGJMcQPmsVDJxHYraMaYj3Dt/08OvsmKI6uLyrPIWFYA67AUSiUKXDYT vwdvZaQuDIP99Bv7EWlznhRjB9SHMxKsBjfCEea/gNdjjTxJN8B2xpuDHCNOgeAZczWN 0nVy3OmM5Q8G6Vh+hlBsDV4zVfpJY40gdrYIbNUPEbid3+0OTPYaNDuyvQ7L1xc8siaB H9aA== X-Gm-Message-State: ALQs6tB7IgCsvZpUQcx/G/XLspu0i96zhNDqxgxwdZpkvEmLfPS+kG88 rrntHwnfWbsVdYcrAih4dJ8fq3yShWFejGFfGiQ= X-Google-Smtp-Source: AIpwx49QOVwBYpRlO2czJf3dgu5EYyZ6qX+7dy8Jg+WTIQCDoYSq7zx4NV/oA7ycbJ9xNsvY70HzfQwaE/l9B3fuuKk= X-Received: by 10.176.24.95 with SMTP id j31mr3759343uag.107.1523623812203; Fri, 13 Apr 2018 05:50:12 -0700 (PDT) MIME-Version: 1.0 Received: by 10.103.86.84 with HTTP; Fri, 13 Apr 2018 05:49:51 -0700 (PDT) In-Reply-To: <1165560441.1162760.1523458611085@mail.yahoo.com> References: <1165560441.1162760.1523458611085.ref@mail.yahoo.com> <1165560441.1162760.1523458611085@mail.yahoo.com> From: Johan Corveleyn Date: Fri, 13 Apr 2018 14:49:51 +0200 Message-ID: Subject: Re: Inconsistent merge on subdirectory behavior? To: Chris Cc: Subversion Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Apr 11, 2018 at 4:56 PM, Chris wrote: > I wanted to reverse-merge some accidental changes on a subdirectory on my= branch and svn really confuses me in this. Is the below behavior from subv= ersion intended or have I stubled on a bug? > > I wanted to reverse-merge revision 1000 on all the files in the directory= "sub/dir", below illustrated with only one file. > > wcroot> svn diff --summarize -c 1000 sub/dir > M sub/dir/foobar.txt > wcroot> svn merge -c -1000 sub/dir > --- Recording mergeinfo for reverse merge of r1000 into '.': > U . > So the file sub/dir/foobar.txt is not reverse-merged (and the merge info = is elided even though the output does not say so) > > I tried a few different versions of this with e.g. -r 1000:999 with ident= ical results. > > Then I did the following, which I thought would be more of the same: > > wcroot> cd foo/bar > wcroot/foo/bar> svn merge -c -1000 . > --- Reverse-merging r1000 into '.': > U sub/dir/foobar.txt > --- Recording mergeinfo for reverse merge of r1000 into '.': > G . > --- Eliding mergeinfo from '.': > U . > > So now it does what I wanted to. > > Is it intended that merge should do different things if I use "." or "sub= /dir" as my WCTARGET? I find it confusing and it was mostly luck that I stu= mbled on the right solution. "svn help merge" does not seem to indicate tha= t these two use cases should be any different, but I may misread it. > Btw, this was done with "svn, version 1.9.5 (r1770682)" > > TIA, > Chris Hi Chris, That does seem strange. However it's quite hard to diagnose this from your description alone, because there are a lot of things that can play a role in the merge algorithm. Would you be able to come up with a reproduction script, or even just a transcript of you reproducing the issue, starting from a clean repository ('svnadmin create'; ...)? For a reproduction script you could use the repro-template.sh or repro-template.bat linked from here: https://subversion.apache.org/docs/community-guide/issues.html#reporting-bu= gs Thanks, --=20 Johan