From users-return-779-daniel=haxx.se@subversion.apache.org Tue Feb 2 15:32:40 2010 Return-Path: Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by giant.haxx.se (8.14.3/8.14.3/Debian-9) with SMTP id o12EWdgC008168 for ; Tue, 2 Feb 2010 15:32:39 +0100 Received: (qmail 88450 invoked by uid 500); 2 Feb 2010 14:32:34 -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 88442 invoked by uid 99); 2 Feb 2010 14:32:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Feb 2010 14:32:34 +0000 X-ASF-Spam-Status: No, hits=1.2 required=10.0 tests=SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [91.211.164.20] (HELO mailout.groupe-ldlc.com) (91.211.164.20) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Feb 2010 14:32:26 +0000 X-IronPort-AV: E=Sophos;i="4.49,390,1262559600"; d="scan'208";a="649344" Received: from unknown (HELO svr-exchange.siege.ldlc.com) ([192.168.31.80]) by mailout.groupe-ldlc.com with ESMTP; 02 Feb 2010 15:32:06 +0100 Received: from [192.168.201.33] (192.168.201.33) by svr-exchange.siege.ldlc.com (192.168.32.20) with Microsoft SMTP Server id 8.1.393.1; Tue, 2 Feb 2010 15:32:05 +0100 Message-ID: <4B683765.9080204@free.fr> Date: Tue, 2 Feb 2010 15:32:05 +0100 From: Olivier Sannier User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.7) Gecko/20100104 SeaMonkey/2.0.2 MIME-Version: 1.0 To: users@subversion.apache.org Subject: Re: Reintegrate with vendor branches References: <4B5FFE0B.2030006@free.fr> In-Reply-To: <4B5FFE0B.2030006@free.fr> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org Olivier Sannier wrote: > Hello all, > > Let's consider the following repository structure : > > tags > branches > feature1 > trunk > libs > libA > libB > project1 > vendors > libA > current > libB > current > > The repository is at revision 100 > libA and libB are external libraries managed as vendor branches which > were merged twice each into the trunk since its beginning. This means > that the following mergeinfo is on trunk/libs/libA : > /vendors/libA/current:25,30 > > and the following on trunk/libs/libB: > /vendors/libB/current:28,36 > > the feature1 branch was created as a copy of /trunk at revision 45 and > changes from trunk were regularly merged into it which gives the > following merge info on /branches/feature1: > /trunk:45-99 > > The last final merge from trunk being done in revision 100. > Now I want to reintegrate the feature branch back into trunk but I get > the an error message saying that it is unable to reintegrate because > some revisions are missing on the branch: > > /branches/feature1/libs/libA is missing /trunk/libs/libA:45-99 > /branches/feature1/libs/libB is missing /trunk/libs/libB:45-99 > > I don't understand why it complains as all changes are already in > since they were merged before the feature branch was created. > Adding the above two paths and revision numbers in the merge infos for > libA and libB allows to reintegrate but I would prefer if this could > be avoided. > This was done with version 1.6.6 clients > > Do you think this is a bug? > If yes, is it already reported and/or a fix available? > If not, what have I done wrong to get to this situation? > > Regards > Olivier > > I wonder if this message was seen, or if I missed some answers. Does anyone have any clue? Thanks Olivier