Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 28A017506 for ; Tue, 1 Nov 2011 23:03:05 +0000 (UTC) Received: (qmail 68672 invoked by uid 500); 1 Nov 2011 23:03:03 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 68639 invoked by uid 500); 1 Nov 2011 23:03:03 -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 68607 invoked by uid 99); 1 Nov 2011 23:03:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Nov 2011 23:03:03 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of douglasg.wilson@gmail.com designates 209.85.210.189 as permitted sender) Received: from [209.85.210.189] (HELO mail-iy0-f189.google.com) (209.85.210.189) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Nov 2011 22:55:23 +0000 Received: by iagz35 with SMTP id z35so4461639iag.16 for ; Tue, 01 Nov 2011 15:55:02 -0700 (PDT) MIME-Version: 1.0 Received: by 10.50.155.196 with SMTP id vy4mr456133igb.4.1320188102933; Tue, 01 Nov 2011 15:55:02 -0700 (PDT) Received: by s32g2000prj.googlegroups.com with HTTP; Tue, 1 Nov 2011 15:55:02 -0700 (PDT) Date: Tue, 1 Nov 2011 15:55:02 -0700 (PDT) In-Reply-To: <20111022092514.GD207@ted.stsp.name> References: <96ca5159-abea-4e03-b9aa-bd7c5d467c68@p27g2000prp.googlegroups.com> <8199dace-e483-43ac-9b53-300f49c3a8fc@p14g2000pra.googlegroups.com> <20111020174554.GB23946@ted.stsp.name> <4d797e57-8bb9-4c60-a724-374e646383a0@r2g2000prh.googlegroups.com> <20111021091045.GJ23946@ted.stsp.name> <20111022092514.GD207@ted.stsp.name> User-Agent: G2/1.0 X-HTTP-Via: 1.1 VMG001P002 X-Google-Web-Client: true X-Google-Header-Order: VCRUHALSNKE X-HTTP-UserAgent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:7.0.1) Gecko/20100101 Firefox/7.0.1,gzip(gfe) X-Google-IP: 66.161.59.254 Message-ID: <87e82517-84f1-4695-bb7f-94a7f4c48c24@s32g2000prj.googlegroups.com> Subject: Re: mergeinfo marked not inheritable on sparse checkout From: Douglas Wilson To: users@subversion.apache.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Oct 22, 2:25=A0am, Stefan Sperling wrote: > > Your reproduction recipe is incomplete. Here is (I hope) a complete reproduction: #!/bin/ksh # Create repo DIR=3D$PWD mkdir -p $DIR/src/trunk/dir1 mkdir -p $DIR/src/trunk/dir2 mkdir -p $DIR/src/branches touch $DIR/src/trunk/dir1/file1.txt touch $DIR/src/trunk/dir2/file2.txt svnadmin create $DIR/testrepo # Create branch svn cp file://$DIR/testrepo/trunk file://$DIR/testrepo/branches/testbranch -m "Create test branch" # Checkout just dir1 svn co --non-recursive file://$DIR/testrepo/trunk test svn update test/dir1 # Make some changes print "Changes" >$DIR/test/dir1/file1.txt svn commit -m "Commit file1 changes" test # Switch to branch and merge cd test svn switch file://$DIR/testrepo/branches/testbranch svn merge -r 2:3 file://$DIR/testrepo/trunk . svn diff