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 i9PDKHfc029410 for ; Mon, 25 Oct 2004 13:20:17 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf1.us4.outblaze.com (Postfix) with ESMTP id DB2465378D for ; Mon, 25 Oct 2004 13:20:11 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CM4tE-0003nc-UX for migo@homemail.com; Mon, 25 Oct 2004 09:28:00 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CM4sK-0003Sa-Hd for gnu-arch-users@gnu.org; Mon, 25 Oct 2004 09:27:04 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CM4sI-0003RM-Du for gnu-arch-users@gnu.org; Mon, 25 Oct 2004 09:27:02 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CM4sH-0003R6-Pj for gnu-arch-users@gnu.org; Mon, 25 Oct 2004 09:27:01 -0400 Received: from [80.91.229.2] (helo=main.gmane.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1CM4jf-0001lv-Do for gnu-arch-users@gnu.org; Mon, 25 Oct 2004 09:18:07 -0400 Received: from list by main.gmane.org with local (Exim 3.35 #1 (Debian)) id 1CM4jd-0003TL-00 for ; Mon, 25 Oct 2004 15:18:05 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: gnu-arch-users@gnu.org From: John Goerzen Date: Mon, 25 Oct 2004 13:15:49 +0000 (UTC) Organization: Complete.Org Message-ID: X-Complaints-To: usenet@complete.org User-Agent: slrn/0.9.8.1 (Debian) Subject: [Gnu-arch-users] Merging from unrelated branches 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: 779 Lines: 17 Hi, I have an existing project being maintained in Arch. I want to import some components from other projects into them. I have imported them into various Arch branches as well. The problem is -- I can't figure how to integrate these new branches into my existing work branch. I've tried update, replay, and star-merge, in various combinations with sync-tree and join-branch. I either get "tree has no common history with version" or it appears to work but doesn't actually pull over any changes. What's the magic recipe for success here? Thanks, John _______________________________________________ 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/