Received: from spf1.us4.outblaze.com (spf1.us4.outblaze.com [205.158.62.23]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id i9PDbBfc014809 for ; Mon, 25 Oct 2004 13:37:12 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf1.us4.outblaze.com (Postfix) with ESMTP id 49413538E4 for ; Mon, 25 Oct 2004 13:37:05 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CM59f-00071j-Al for migo@homemail.com; Mon, 25 Oct 2004 09:44:59 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CM59H-00071K-Rp for gnu-arch-users@gnu.org; Mon, 25 Oct 2004 09:44:35 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CM59H-000718-Dm for gnu-arch-users@gnu.org; Mon, 25 Oct 2004 09:44:35 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CM59H-000715-Af for gnu-arch-users@gnu.org; Mon, 25 Oct 2004 09:44:35 -0400 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 1CM51Y-0004l8-Hp for gnu-arch-users@gnu.org; Mon, 25 Oct 2004 09:36:36 -0400 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 i9PDaOil003883; Mon, 25 Oct 2004 09:36:24 -0400 Message-ID: <417D0158.8070608@panoramicfeedback.com> Date: Mon, 25 Oct 2004 09:36:24 -0400 From: Aaron Bentley User-Agent: Mozilla Thunderbird 0.5 (X11/20040309) X-Accept-Language: en-us, en MIME-Version: 1.0 To: John Goerzen Subject: Re: [Gnu-arch-users] Merging from unrelated branches References: In-Reply-To: Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Panometrics-MailScanner: Found to be clean Cc: gnu-arch-users@gnu.org 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: 633 Lines: 29 Hi John, John Goerzen wrote: > The problem is -- I can't figure how to integrate these new branches > into my existing work branch. > What's the magic recipe for success here? Copy the files and IDs, then sync-tree. This is described in detail on the wiki: http://wiki.gnuarch.org/moin.cgi/Arch_20Recipes Under "Merge one project into another" Aaron -- Aaron Bentley Director of Technology Panometrics, Inc. _______________________________________________ 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/