From users-return-27052-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Sun Apr 15 14:54:06 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 34795180648 for ; Sun, 15 Apr 2018 14:54:06 +0200 (CEST) Received: (qmail 32818 invoked by uid 500); 15 Apr 2018 12:54:04 -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 32804 invoked by uid 99); 15 Apr 2018 12:54:04 -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; Sun, 15 Apr 2018 12:54:04 +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 B16521802E6 for ; Sun, 15 Apr 2018 12:54:03 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.101 X-Spam-Level: X-Spam-Status: No, score=-0.101 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, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd3-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=yahoo.se 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 k5HbWGJ32fHk for ; Sun, 15 Apr 2018 12:53:58 +0000 (UTC) Received: from sonic301-48.consmr.mail.gq1.yahoo.com (sonic301-48.consmr.mail.gq1.yahoo.com [98.137.64.174]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTPS id 86E415FAEB for ; Sun, 15 Apr 2018 12:53:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.se; s=s2048; t=1523796830; bh=Xi8oZVmIGtmE3nGTjcHCC4UVE3U9/fTSEJrrS5pKsOU=; h=Date:From:Reply-To:To:Cc:Subject:References:From:Subject; b=rdWJhJ2h/Bl5dfGri8oSlnx5fxRyPvye9ECnjzsDNYS+k7uswMZ2jSG0Xi1ulEc5jeiBhflDgWOxQuiFtmxiFjKWmONmkti3/qNKtFllb41hGoLySQN5BxHUl5b3+b8zvK3Pbx3ipzgrySxoDt1T6V8Hbg451YyCIoqNsaGnXBb0seqmXE9VFDxaEwzv51O4ABeFYLyIwePZJ3VDx9SSWUQ00uvCodozitFO0dAKs88R3NhV5QmP2M2LP229itBAU7B34h5FcSaDjEwGhNpvRb1Ra06eUl3Cm2KuDtrw91+UIq/t/yG/HHTTL6ebz4f1In94Ns2HGOJkOEs5l3rjBw== X-YMail-OSG: U.liJS0VM1lAFDMOBG1rm.ni.kjb__nrPMa2CmlhKzxYPyuBpIXk4pDVuqN7XNr fUmuqnkX20jl_sWVVJdu7u2plzy_LWi.z_hO.NoK0JOTCrr9RHvTIopzlCwxJW2S5pdH8g0mkyRK AePV2ZWDAmlY8PA5TXk7YcCHU5NJILB6wowZKJWIZ1zWmIK2hYyvKqrZr534eTfSErqcg_hUzd5_ S5IJ_KPQjJYeru1QxITECDC_Q4EG3.C2M35xkCI_5_UFKh6xqHLyCA_LkNQdL8DikXCYxVexxmqG mz_n.tsNAAmL_L2TTT8JZnvIZfIqQH694nPAvG2o2RPWv6CrKIm8eGAjBTuTe817zsNlCxuNcOyY SfEPS81ePLgbMAMjQ_ZKkFlMDK.JTWQQGkNrI2ouOKaoxle78LXYJ8C4QZzWBb8mHaU2.nAAhbqE R4yKk_JXmLbvGi4WP6cpbV_iNtll5FR0FTkXbv6rHStySmP1GVEK_5W4N.uZGpgUeYtsA.tffKMB .9enK Received: from sonic.gate.mail.ne1.yahoo.com by sonic301.consmr.mail.gq1.yahoo.com with HTTP; Sun, 15 Apr 2018 12:53:50 +0000 Date: Sun, 15 Apr 2018 12:49:49 +0000 (UTC) From: Chris Reply-To: Chris To: Chris , Johan Corveleyn Cc: Subversion Message-ID: <811133600.262498.1523796589997@mail.yahoo.com> Subject: Re: Inconsistent merge on subdirectory behavior? MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_262497_1405073945.1523796589997" References: <811133600.262498.1523796589997.ref@mail.yahoo.com> X-Mailer: WebService/1.1.11782 YahooMailBasic Mozilla/5.0 (X11; FreeBSD amd64; rv:55.0) Gecko/20100101 Firefox/55.0 ------=_Part_262497_1405073945.1523796589997 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi Johan and thanks for the reply. I made a very simple reproduction script and attached it to this mail, the = behavior seems to be easy to reproduce. Haven't made a reproducton script b= efore so I'm not sure how you want the issue to be explained, but I first d= id the behavior that I think is incorrect and did a status+echo and then th= e same from a subdirectory with a second status+echo. If you instead wanted me to make a bug report on the tracker, let me know. /Chris -------------------------------------------- On Fri, 4/13/18, Johan Corveleyn wrote: Subject: Re: Inconsistent merge on subdirectory behavior? To: "Chris" Cc: "Subversion" Date: Friday, April 13, 2018, 2:49 PM =20 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 subversion 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 '.': >=C2=A0 U=C2=A0 . > 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 identical 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=C2=A0 =C2=A0 sub/dir/foobar.txt > --- Recording mergeinfo for reverse merge of r1000 into '.': >=C2=A0 G=C2=A0 . > --- Eliding mergeinfo from '.': >=C2=A0 U=C2=A0 . > > 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 stumbled on the right solution. "svn help merge" does not seem to indicate that 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, >=C2=A0 Chris =20 Hi Chris, =20 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. =20 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'; ...)? =20 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-b= ugs =20 Thanks, --=20 Johan ------=_Part_262497_1405073945.1523796589997 Content-Type: application/x-shellscript Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="repro-template.sh" Content-ID: IyEvYmluL3NoCgojIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKIyMgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMjCiMj ICBUaGlzIGlzIGEgdGVtcGxhdGUgZm9yIHdyaXRpbmcgU3VidmVyc2lvbiBidWcgcmVwcm9kdWN0 aW9uIHNjcmlwdHMuICAgICAjIwojIyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIyMKIyMgIEl0IGNyZWF0ZXMg YSByZXBvc2l0b3J5IGNvbnRhaW5pbmcgdGhlIHN0YW5kYXJkIEdyZWVrIFRyZWUgKHNlZSAgICAg ICAgICMjCiMjICBodHRwOi8vc3ZuLmFwYWNoZS5vcmcvcmVwb3MvYXNmL3N1YnZlcnNpb24vdHJ1 bmsvc3VidmVyc2lvbi90ZXN0cy9ncmVlay10cmVlLnR4dCkgIyMKIyMgIGFuZCBjaGVja3Mgb3V0 IGEgd29ya2luZyBjb3B5IGNvbnRhaW5pbmcgdGhhdCB0cmVlLiAgUGxlYXNlIGFkanVzdCAgICAg ICMjCiMjICB0aGlzIHNjcmlwdCBob3dldmVyIHlvdSBuZWVkIHRvIHRvIGRlbW9uc3RyYXRlIHlv dXIgYnVnLiAgV2hlbiBpdCdzICAgICAjIwojIyAgcmVhZHksIHBvc3QgdGhlIGJ1ZyByZXBvcnQg dG8gZGV2QHN1YnZlcnNpb24uYXBhY2hlLm9yZyAtLSBhZnRlciAgICAgICAgIyMKIyMgIGh0dHA6 Ly9zdWJ2ZXJzaW9uLmFwYWNoZS5vcmcvZG9jcy9jb21tdW5pdHktZ3VpZGUvaXNzdWVzLmh0bWwj cmVwb3J0aW5nLWJ1Z3MsICMjCiMjICBvZiBjb3Vyc2UuICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIwojIyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIyMKIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCgojIFlvdSBtaWdodCBuZWVkIHRvIGFkanVzdCB0 aGVzZSBsaW5lcyB0byBwb2ludCB0byB5b3VyCiMgY29tcGlsZWQtZnJvbS1zb3VyY2UgU3VidmVy c2lvbiBiaW5hcmllcywgaWYgdXNpbmcgdGhvc2U6CmlmIFsgLXogIiRTVk4iIF07IHRoZW4KICBT Vk49YHdoaWNoIHN2bmAKICBTVk5TRVJWRT1gd2hpY2ggc3Zuc2VydmVgCiAgU1ZOQURNSU49YHdo aWNoIHN2bmFkbWluYApmaQoKIyBNYWtlIHN1cmUgd2UgZG9uJ3QgdXNlICRIT01FLy5zdWJ2ZXJz aW9uLy4KU1ZOPSIke1NWTn0gLS1jb25maWctZGlyPWBwd2RgL3N2bi1yZXByby1jb25maWctZGly IgpTVk5BRE1JTj0iJHtTVk5BRE1JTn0gLS1jb25maWctZGlyPWBwd2RgL3N2bi1yZXByby1jb25m aWctZGlyIgpTVk5TRVJWRT0iJHtTVk5TRVJWRX0gLS1jb25maWctZGlyPWBwd2RgL3N2bi1yZXBy by1jb25maWctZGlyIgoKIyBVc2UgRW5nbGlzaCBvdXRwdXQuCkxDX0FMTD1DOyBleHBvcnQgTENf QUxMCgojIFNlbGVjdCBhbiBhY2Nlc3MgbWV0aG9kLiAgSWYgc3ZuOi8vLCB0aGUgc3Zuc2VydmUg c2V0dXAgaXMKIyBoYW5kbGVkIGF1dG9tYWdpY2FsbHkgYnkgdGhpcyBzY3JpcHQ7IGJ1dCBpZiBo dHRwOi8vLCB0aGVuCiMgeW91J2xsIGhhdmUgdG8gY29uZmlndXJlIGl0IHlvdXJzZWxmIGZpcnN0 LgojIAojIFVSTD1odHRwOi8vbG9jYWxob3N0L1NPTUVUSElORy9yZXBvcwojIFVSTD1zdm46Ly9s b2NhbGhvc3QvcmVwb3MKVVJMPWZpbGU6Ly8vYHB3ZGAvcmVwb3MKCmlmIFsgLWUgcmVwb3MgXTsg dGhlbiBybSAtcmYgcmVwb3M7IGZpCmlmIFsgLWUgd2MgXTsgdGhlbiBybSAtcmYgd2M7IGZpCmlm IFsgLWUgaW1wb3J0LW1lIF07IHRoZW4gcm0gLXJmIGltcG9ydC1tZTsgZmkKCiR7U1ZOQURNSU59 IGNyZWF0ZSByZXBvcwoKIyBUaGVzZSBhcmUgZm9yIHN2bnNlcnZlIG9ubHkuCiNlY2hvICJbZ2Vu ZXJhbF0iID4gcmVwb3MvY29uZi9zdm5zZXJ2ZS5jb25mCiNlY2hvICJhbm9uLWFjY2VzcyA9IHdy aXRlIiA+PiByZXBvcy9jb25mL3N2bnNlcnZlLmNvbmYKI2VjaG8gImF1dGgtYWNjZXNzID0gd3Jp dGUiID4+IHJlcG9zL2NvbmYvc3Zuc2VydmUuY29uZgoKIyBUaGUgc2VydmVyIHdpbGwgb25seSBi ZSBjb250YWN0ZWQgaWYgJFVSTCBpcyBzdm46Ly9mb28sIG9mIGNvdXJzZS4KIyR7U1ZOU0VSVkV9 IC0tcGlkLWZpbGUgc3Zuc2VydmUtcGlkIC1kIC1yIGBwd2RgCiMgQW5kIHB1dCB0aGUga2lsbCBj b21tYW5kIGluIGEgZmlsZSwgaW4gY2FzZSBuZWVkIHRvIHJ1biBpdCBtYW51YWxseS4KI2VjaG8g ImtpbGwgLTkgYGNhdCBzdm5zZXJ2ZS1waWRgIiA+IGsKI2NobW9kIGErcnd4IGsKCmVjaG8gIiMj IyBNYWtpbmcgYSBHcmVlayBUcmVlIGZvciBpbXBvcnQuLi4iCm1rZGlyIGltcG9ydC1tZQpta2Rp ciBpbXBvcnQtbWUvdHJ1bmsKbWtkaXIgaW1wb3J0LW1lL3RhZ3MKbWtkaXIgaW1wb3J0LW1lL2Jy YW5jaGVzCm1rZGlyIGltcG9ydC1tZS90cnVuay9BCm1rZGlyIGltcG9ydC1tZS90cnVuay9BL0Iv Cm1rZGlyIGltcG9ydC1tZS90cnVuay9BL0MvCm1rZGlyIGltcG9ydC1tZS90cnVuay9BL0QvCm1r ZGlyIGltcG9ydC1tZS90cnVuay9BL0IvRS8KbWtkaXIgaW1wb3J0LW1lL3RydW5rL0EvQi9GLwpt a2RpciBpbXBvcnQtbWUvdHJ1bmsvQS9EL0cvCm1rZGlyIGltcG9ydC1tZS90cnVuay9BL0QvSC8K ZWNobyAiVGhpcyBpcyB0aGUgZmlsZSAnaW90YScuIiAgICAgICAgPiBpbXBvcnQtbWUvdHJ1bmsv aW90YQplY2hvICJUaGlzIGlzIHRoZSBmaWxlICdBL211Jy4iICAgICAgICA+IGltcG9ydC1tZS90 cnVuay9BL211CmVjaG8gIlRoaXMgaXMgdGhlIGZpbGUgJ0EvQi9sYW1iZGEnLiIgID4gaW1wb3J0 LW1lL3RydW5rL0EvQi9sYW1iZGEKZWNobyAiVGhpcyBpcyB0aGUgZmlsZSAnQS9CL0UvYWxwaGEn LiIgPiBpbXBvcnQtbWUvdHJ1bmsvQS9CL0UvYWxwaGEKZWNobyAiVGhpcyBpcyB0aGUgZmlsZSAn QS9CL0UvYmV0YScuIiAgPiBpbXBvcnQtbWUvdHJ1bmsvQS9CL0UvYmV0YQplY2hvICJUaGlzIGlz IHRoZSBmaWxlICdBL0QvZ2FtbWEnLiIgICA+IGltcG9ydC1tZS90cnVuay9BL0QvZ2FtbWEKZWNo byAiVGhpcyBpcyB0aGUgZmlsZSAnQS9EL0cvcGknLiIgICAgPiBpbXBvcnQtbWUvdHJ1bmsvQS9E L0cvcGkKZWNobyAiVGhpcyBpcyB0aGUgZmlsZSAnQS9EL0cvcmhvJy4iICAgPiBpbXBvcnQtbWUv dHJ1bmsvQS9EL0cvcmhvCmVjaG8gIlRoaXMgaXMgdGhlIGZpbGUgJ0EvRC9HL3RhdScuIiAgID4g aW1wb3J0LW1lL3RydW5rL0EvRC9HL3RhdQplY2hvICJUaGlzIGlzIHRoZSBmaWxlICdBL0QvSC9j aGknLiIgICA+IGltcG9ydC1tZS90cnVuay9BL0QvSC9jaGkKZWNobyAiVGhpcyBpcyB0aGUgZmls ZSAnQS9EL0gvb21lZ2EnLiIgPiBpbXBvcnQtbWUvdHJ1bmsvQS9EL0gvb21lZ2EKZWNobyAiVGhp cyBpcyB0aGUgZmlsZSAnQS9EL0gvcHNpJy4iICAgPiBpbXBvcnQtbWUvdHJ1bmsvQS9EL0gvcHNp CmVjaG8gIiMjIyBEb25lLiIKZWNobyAiIgplY2hvICIjIyMgSW1wb3J0aW5nIGl0Li4uIgooY2Qg aW1wb3J0LW1lOyAke1NWTn0gaW1wb3J0IC1xIC1tICJJbml0aWFsIGltcG9ydC4iICR7VVJMfSkK ZWNobyAiIyMjIERvbmUuIgplY2hvICIiCgoke1NWTn0gY28gLXEgJHtVUkx9L3RydW5rIHdjCgpj ZCB3YwplY2hvICJyZWFsY2hhbmdlIiA+IGlvdGE7IHRvdWNoIEEvZm9vOyBzdm4gYWRkIEEvZm9v OyBzdm4gY29tbWl0IC1tICdjaGFuZ2UgaW4gdHdvIHBsYWNlcyB3aGVyZSBvbmUgd2lsbCBiZSBy ZXZlcnNlLW1lcmdlZCBsYXRlcicKc3ZuIHVwZGF0ZTsKc3ZuIG1lcmdlIC1jIC0yIEE7CnN2biBz dGF0dXM7CmVjaG8gIkZpbGUgQS9mb28gaXMgbm90IGRlbGV0ZWQgYnkgdGhlIGFib3ZlIG1lcmdl IGNvbW1hbmQiOwpjZCBBOyAgc3ZuIG1lcmdlIC1jIC0yIC47IGNkIC0Kc3ZuIHN0YXR1czsKZWNo byAiTm93IHRoZSBmaWxlIHdhcyBkZWxldGVkIGR1ZSB0byBzdGFuZGluZyBpbiB0aGUgc3ViZGly ZWN0b3J5IjsKY2QgLi4KCgojIFB1dCBraWxsIGNvbW1hbmQgaW4gYSBmaWxlLCBpbiBjYXNlIG5l ZWQgdG8gcnVuIGl0IG1hbnVhbGx5LgojZWNobyAia2lsbCAtOSBgY2F0IHN2bnNlcnZlLXBpZGAi ID4gawojY2htb2QgYStyd3ggawojLi9rCg== ------=_Part_262497_1405073945.1523796589997--