Received: from spf3.us4.outblaze.com (spf3.us4.outblaze.com [205.158.62.25]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id iBK4Butj007022 for ; Mon, 20 Dec 2004 04:11:57 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf3.us4.outblaze.com (Postfix) with ESMTP id 36F5653960 for ; Mon, 20 Dec 2004 04:12:20 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CgF4c-00048o-UK for migo@homemail.com; Sun, 19 Dec 2004 23:23:06 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CgF3Z-00046u-F6 for gnu-arch-users@gnu.org; Sun, 19 Dec 2004 23:22:01 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CgF3V-00045Y-QQ for gnu-arch-users@gnu.org; Sun, 19 Dec 2004 23:21:58 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CgF3V-00044j-Jf for gnu-arch-users@gnu.org; Sun, 19 Dec 2004 23:21:57 -0500 Received: from [66.216.124.41] (helo=server4.panoramicfeedback.com) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.34) id 1CgEru-0001XX-Vn for gnu-arch-users@gnu.org; Sun, 19 Dec 2004 23:09:59 -0500 Received: from panoramicfeedback.com (server4.panoramicfeedback.com [66.216.124.41]) by server4.panoramicfeedback.com (8.12.3/8.12.3/Debian-6.6) with ESMTP id iBK49til004053; Sun, 19 Dec 2004 23:09:56 -0500 Message-ID: <41C650A3.4040005@panoramicfeedback.com> Date: Sun, 19 Dec 2004 23:10:11 -0500 From: Aaron Bentley User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.6b) Gecko/20031205 Thunderbird/0.4 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Zenaan Harkness Subject: Re: [Gnu-arch-users] star-merge: unable to merge unrelated trees References: <1103504548.30881.678.camel@localhost.localdomain> In-Reply-To: <1103504548.30881.678.camel@localhost.localdomain> X-Enigmail-Version: 0.82.4.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Panometrics-MailScanner: Found to be clean Cc: arch X-BeenThere: gnu-arch-users@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: a discussion list for all things arch-ish List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org Status: RO Content-Length: 1351 Lines: 55 Zenaan Harkness wrote: > if I do the following as user zen, I get an error: > > $ tla get $parthat t > ... > $ cd t > > $ tla star-merge --three-way $dmitriat It looks like $parthat has no patchlogs for $dmitriat. You would expect this to happen at first. You could probably make this work by using "tla star-merge --reference $archat --three-way $dmitriat" > However, if I do the following, it works just fine: > > $ tla get $archat t > ... > $ cd t > > $ tla star-merge --three-way $parthat > ... > > $ tla star-merge --three-way $dmitriat I assume these work because $parthat and $dmitriat have patchlogs for $archat. > Is this to be expected? Yes. By default, star-merge will only look for ancestors in the current tree's VERSION and the specified revision's version. If neither tree has a patchlog for the other's version, it won't work. It's worth noting that there are alternative approaches to selecting a merge ancestor in Fai and the latest revisions of baz. Either would probably handle your case without requiring a --reference parameter. > Has something gone wrong in our archives? No. Aaron _______________________________________________ Gnu-arch-users mailing list Gnu-arch-users@gnu.org http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/