Return-Path: Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: (qmail 34024 invoked from network); 22 Feb 2011 16:08:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Feb 2011 16:08:10 -0000 Received: (qmail 30475 invoked by uid 500); 22 Feb 2011 16:08:09 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 30374 invoked by uid 500); 22 Feb 2011 16:08:07 -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 30367 invoked by uid 99); 22 Feb 2011 16:08:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Feb 2011 16:08:06 +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 (nike.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:07:59 +0000 Received: by ewy22 with SMTP id 22so1254381ewy.16 for ; Tue, 22 Feb 2011 08:07:39 -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=i88yFzrSB0JYJdsujHEjh66qj0nqFbq5dTv6dig2b/M=; b=iYdUgPJ80vBlu136zh96/Ay8WZ0CDk89qSK11+zwTqfPH92/zHApwxSY64ELOu9GaF tYlJYkJNY0Vlo4AsM00QE/KmIaZ9BJKb3T/ezi3JjAJDsVa4YR7xeulI1f281GF/WzJD 9YWyxiRiv9hVW9BCczac/Ii7SOo5LBmnaKAP4= 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=mg8MIVuSRlsQ+on1QxIzJmbBJszr1nmFnZTxpepOZ+4A/l3L1obfD7VOPHFuw8NbyD B9N73jshsaRf9DsZrNB1BY/wef4M4iD6DC5PV0oKpWApLhZ+ORIUWzJWveE3cz7GWO67 fIKJsByZhQWHskPA/5Sit53dMJ+DdTcU/x2JA= MIME-Version: 1.0 Received: by 10.213.110.18 with SMTP id l18mr3252450ebp.45.1298390858874; Tue, 22 Feb 2011 08:07:38 -0800 (PST) Received: by 10.213.102.19 with HTTP; Tue, 22 Feb 2011 08:07:38 -0800 (PST) In-Reply-To: References: <20110222151013.GN11578@ted.stsp.name> Date: Tue, 22 Feb 2011 11:07:38 -0500 Message-ID: Subject: Re: bug in mixed-version detection + single-file externals From: Jason Sachs To: users@subversion.apache.org Content-Type: text/plain; charset=ISO-8859-1 X-Virus-Checked: Checked by ClamAV on apache.org >> 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) > Script output: ========= C:\tmp\svn\ext1>python trybug.py Checked out revision 0. A C:\tmp\svn\ext1\working\foo A C:\tmp\svn\ext1\working\foo\trunk A C:\tmp\svn\ext1\working\bar A C:\tmp\svn\ext1\working\bar\trunk A working\foo\trunk\blah.txt Adding working\bar Adding working\bar\trunk Adding working\foo Adding working\foo\trunk Adding working\foo\trunk\blah.txt Transmitting file data . Committed revision 1. Sending working\foo\trunk\blah.txt Transmitting file data . Committed revision 2. Sending working\foo\trunk\blah.txt Transmitting file data . Committed revision 3. property 'svn:externals' set on 'working\bar\trunk' Sending working\bar\trunk Committed revision 4. Fetching external item into 'working\bar\trunk\blah.txt' E working\bar\trunk\blah.txt Updated external to revision 1. Updated to revision 4. 1:4 ========= This just creates a sample repos + working copy and illustrates the problem with svnversion, which should print out "4" but instead prints out "1:4". I didn't create a testcase for performing a merge, that's more complex than I can deal with right now.