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 j0KBZlJB024378 for ; Thu, 20 Jan 2005 11:35:47 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf1.us4.outblaze.com (Postfix) with ESMTP id 01218298456 for ; Thu, 20 Jan 2005 11:36:12 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1CranL-0000ua-S6 for migo@homemail.com; Thu, 20 Jan 2005 06:48:12 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1CraXa-0003gX-QL for gnu-arch-users@gnu.org; Thu, 20 Jan 2005 06:31:55 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1CraX1-0003Eh-4y for gnu-arch-users@gnu.org; Thu, 20 Jan 2005 06:31:19 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1CraW0-0002bF-7s for gnu-arch-users@gnu.org; Thu, 20 Jan 2005 06:30:16 -0500 Received: from [64.233.170.202] (helo=rproxy.gmail.com) by monty-python.gnu.org with esmtp (Exim 4.34) id 1CraJy-0002x4-Ok for gnu-arch-users@gnu.org; Thu, 20 Jan 2005 06:17:50 -0500 Received: by rproxy.gmail.com with SMTP id i8so77605rne for ; Thu, 20 Jan 2005 03:17:49 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:mime-version:content-type:content-transfer-encoding; b=DjzvbX0zkntlRssOHXll1+rCBYkIN9ZHQAA+5Bfv9SYUNfe53yEq1reSFqZWHpFIXK0420iNgKPsW+eMxwu61rtgJZGDac6ZlKNqWQ4f16CsdGBH9KN9oJ2Pb2zeaF+tmMRG332K93XDlEjp+K8+wOCLMhs1cJtxthGj1alFjW4= Received: by 10.38.15.14 with SMTP id 14mr391767rno; Thu, 20 Jan 2005 03:17:49 -0800 (PST) Received: by 10.38.101.29 with HTTP; Thu, 20 Jan 2005 03:17:49 -0800 (PST) Message-ID: Date: Thu, 20 Jan 2005 12:17:49 +0100 From: Christian von Kietzell To: gnu-arch-users@gnu.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [Gnu-arch-users] replaying patches X-BeenThere: gnu-arch-users@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Christian von Kietzell 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: 1238 Lines: 33 Hi, I'm looking for suggestions for the following problem... Suppose I've got a version called 'import--main--0.1'. At one time I branched off 'import--heilbronn--0.1'. I made some changes to the branch. I have now decided it makes no sense to keep those in a separate branch. I rather want to use a build option to generate the two different binaries, and therefore merge the branch back into 'main'. Now, the branch consists of four changesets, all of which will probably apply cleanly. The problem is that the first changeset will overwrite some code I want to keep. But I want the code from the branch in there, too, so that I can choose at build time. So what I'd like to do now is make tla think the changeset has already been applied, copy the code into the main branch, and then replay the remaining patches (or use star-merge). Is this possible? Can I just add a patch log for this revision to the main branch, an empty changeset, so to speak? Or is there a better way to go about this? Cheers, Christian _______________________________________________ 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/