Return-Path: Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: (qmail 24507 invoked from network); 22 Feb 2011 16:03:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Feb 2011 16:03:15 -0000 Received: (qmail 24606 invoked by uid 500); 22 Feb 2011 16:03:14 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 24522 invoked by uid 500); 22 Feb 2011 16:03:13 -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 24512 invoked by uid 99); 22 Feb 2011 16:03:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Feb 2011 16:03:12 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS,T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of jmsachs@gmail.com designates 209.85.215.43 as permitted sender) Received: from [209.85.215.43] (HELO mail-ew0-f43.google.com) (209.85.215.43) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Feb 2011 16:03:05 +0000 Received: by ewy22 with SMTP id 22so1248799ewy.16 for ; Tue, 22 Feb 2011 08:02:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:content-type; bh=XZWVxwoFtGWdlnAZ3b5SqdlGzLkXNMZrhMk9HIOEwkI=; b=JIiahAnp5I8YMBAAi1caqUNnsv+/lLU/RjpBAq1NG4pWf3xugBK1h1NCISyjc/g3bu FgzXNqsD1ZvBIuRBWMrpdUPhIlKagzigk2s9zxoG3JE7QEUxRRc/8a9BDRep5oPx7M3f xbdrXwPE/uBICsMU7hBpC76v3KH53IQ5gWw4w= 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 :content-type; b=KnoY/c5HLd7NUK//uxwZ8iWhfNHKa54YZZEPXeZevhlHNKJ9xa/WlL/QVGREU0Nohn XDqoyRUX2iSQiHdWf9UpZIJXKjyNjpxSwuvIBmQvBxe2HkZV6LWyWgOlu7AyZayP6qsY xiRu3Ovr1ZAtpls2De2vMLYxmPQmA+rqEKpuw= MIME-Version: 1.0 Received: by 10.213.32.67 with SMTP id b3mr3314295ebd.39.1298390563663; Tue, 22 Feb 2011 08:02:43 -0800 (PST) Received: by 10.213.102.19 with HTTP; Tue, 22 Feb 2011 08:02:43 -0800 (PST) In-Reply-To: <20110222151013.GN11578@ted.stsp.name> References: <20110222151013.GN11578@ted.stsp.name> Date: Tue, 22 Feb 2011 11:02:43 -0500 Message-ID: Subject: Re: bug in mixed-version detection + single-file externals From: Jason Sachs To: users@subversion.apache.org Content-Type: multipart/mixed; boundary=0015174c3f4453b105049ce11c90 --0015174c3f4453b105049ce11c90 Content-Type: text/plain; charset=ISO-8859-1 > The problem with reintegrate merges you are describing sounds > quite serious and should be added to the issue tracker. I had recently submitted it (but didn't know about posting to this list first). See http://subversion.tigris.org/issues/show_bug.cgi?id=3816 > Can you share more information to allow others to reproduce this problem? > What do your file externals definitions look like? Are you pinning externals > to known revisions or are they coming from URLS in the HEAD revision? They are pinned to known revisions, they look like "-r 12345 ^/path/to/my/branch/somefile somefile" (I never use the HEAD revision) > If you could write a script that starts with an empty repository, gets a > working copy, and runs svn commands until the problem triggers, that would > help greatly (and avoids any ambiguity in the problem description!). See attached python script (tested only on WinXP + Python 2.6.5) --0015174c3f4453b105049ce11c90 Content-Type: text/plain; charset=US-ASCII; name="trybug.py" Content-Disposition: attachment; filename="trybug.py" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gkh06y3j0 aW1wb3J0IHN1YnByb2Nlc3MNCmltcG9ydCBvcw0KDQpkZWYgZ2V0RGlyQXNVUkwoKToNCglyZXR1 cm4gImZpbGU6Ly8vIisob3MuZ2V0Y3dkKCkucmVwbGFjZSgnXFwnLCcvJykpDQoNCmRlZiB3cml0 ZUZpbGUoZmlsZW5hbWUscyk6DQoJd2l0aCBvcGVuKGZpbGVuYW1lLCJ3IikgYXMgZjoNCgkJZi53 cml0ZShzKQ0KCQ0KZGVmIHN2bmFkZChwYXRoKToNCglzdWJwcm9jZXNzLmNhbGwoWyJzdm4iLCJh ZGQiLHBhdGhdKQ0KCQ0KZGVmIHN2bmNvbW1pdChwYXRoLHVzZXJuYW1lLG1zZyk6DQoJc3VicHJv Y2Vzcy5jYWxsKFsic3ZuIiwiY29tbWl0IixwYXRoLCItLXVzZXJuYW1lIix1c2VybmFtZSwiLW0i LG1zZ10pDQoJDQpkZWYgc3ZucHJvcHNldChwYXRoLHByb3BuYW1lLHByb3B2YWwpOg0KCXN1YnBy b2Nlc3MuY2FsbChbInN2biIsInByb3BzZXQiLHByb3BuYW1lLHByb3B2YWwscGF0aF0pDQoJDQpk ZWYgc3ZudXBkYXRlKHBhdGgpOg0KCXN1YnByb2Nlc3MuY2FsbChbInN2biIsInVwZGF0ZSIscGF0 aF0pDQoJDQpkZWYgc3ZudmVyc2lvbihwYXRoKToNCglzdWJwcm9jZXNzLmNhbGwoWyJzdm52ZXJz aW9uIixwYXRoXSkNCgkNCnN1YnByb2Nlc3MuY2FsbChbInN2bmFkbWluIiwiY3JlYXRlIiwicmVw b3MiXSkNCnN1YnByb2Nlc3MuY2FsbChbInN2biIsImNvIixnZXREaXJBc1VSTCgpKyIvcmVwb3Mi LCJ3b3JraW5nIl0pDQpzdWJwcm9jZXNzLmNhbGwoWyJzdm4iLCJta2RpciIsIndvcmtpbmcvZm9v L3RydW5rLyIsIi0tcGFyZW50cyJdKQ0Kc3VicHJvY2Vzcy5jYWxsKFsic3ZuIiwibWtkaXIiLCJ3 b3JraW5nL2Jhci90cnVuay8iLCItLXBhcmVudHMiXSkNCndyaXRlRmlsZSgid29ya2luZy9mb28v dHJ1bmsvYmxhaC50eHQiLCJ0aGlzIGlzIGJsYWgudHh0LCBmaXJzdCB2ZXJzaW9uIikNCnN2bmFk ZCgid29ya2luZy9mb28vdHJ1bmsvYmxhaC50eHQiKQ0Kc3ZuY29tbWl0KCJ3b3JraW5nIiwiZGFl bW9uIiwiaW5pdCBjaGVja2luIikNCndyaXRlRmlsZSgid29ya2luZy9mb28vdHJ1bmsvYmxhaC50 eHQiLCJ0aGlzIGlzIGJsYWgudHh0LCBzZWNvbmQgdmVyc2lvbiIpDQpzdm5jb21taXQoIndvcmtp bmciLCJkYWVtb24iLCJuZXh0IGNoZWNraW4iKQ0Kd3JpdGVGaWxlKCJ3b3JraW5nL2Zvby90cnVu ay9ibGFoLnR4dCIsInRoaXMgaXMgYmxhaC50eHQsIHRoaXJkIHZlcnNpb24iKQ0Kc3ZuY29tbWl0 KCJ3b3JraW5nIiwiZGFlbW9uIiwibmV4dCBjaGVja2luIikNCnN2bnByb3BzZXQoIndvcmtpbmcv YmFyL3RydW5rLyIsInN2bjpleHRlcm5hbHMiLCIgYmxhaC50eHQgLXIgMSBeL2Zvby90cnVuay9i bGFoLnR4dCIpDQpzdm5jb21taXQoIndvcmtpbmciLCJkYWVtb24iLCJhZGQgZXh0ZXJuYWxzIikN CnN2bnVwZGF0ZSgid29ya2luZyIpDQpzdm52ZXJzaW9uKCJ3b3JraW5nIikNCg== --0015174c3f4453b105049ce11c90--