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." _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org http://lists.gnu.org/mailman/listinfo/grub-devel
