From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1N7Uz9-0005J9-S7 for mharc-grub-devel@gnu.org; Mon, 09 Nov 2009 09:12:47 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N7Uz7-0005Io-I9 for grub-devel@gnu.org; Mon, 09 Nov 2009 09:12:45 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N7Uz3-0005Hz-66 for grub-devel@gnu.org; Mon, 09 Nov 2009 09:12:45 -0500 Received: from [199.232.76.173] (port=54633 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N7Uz2-0005Hw-QO for grub-devel@gnu.org; Mon, 09 Nov 2009 09:12:40 -0500 Received: from xvm-190-8.ghst.net ([217.70.190.8]:33265 helo=aybabtu.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1N7Uz2-0002T1-6m for grub-devel@gnu.org; Mon, 09 Nov 2009 09:12:40 -0500 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1N7Uz0-0007FL-3r for grub-devel@gnu.org; Mon, 09 Nov 2009 15:12:38 +0100 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1N7Uyz-0006e7-It for grub-devel@gnu.org; Mon, 09 Nov 2009 15:12:37 +0100 Date: Mon, 9 Nov 2009 15:12:37 +0100 From: Robert Millan To: The development of GNU GRUB Message-ID: <20091109141237.GA19358@thorin> References: <4AF6E563.9070208@gmail.com> <4AF72DCE.0@gmail.com> <4AF7D5A3.3050600@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.18 (2008-05-17) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: Re: bzr is online X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2009 14:12:46 -0000 On Mon, Nov 09, 2009 at 04:53:37PM +0800, Bean wrote: > > Hi, > > I use the following method to apply patches: > > find a common parent for old and new branch. > move one revision up in old branch, > remove all files expect .bzr in new branch, then copy files from old branch. > use bzr commit to commit in new branch, the move new branch up one > revision, and it has an identical tree as old branch. > repeat the steps until all revision is synced, Try with bzr merge command. -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."