On Fri, 11 Apr 2008, Peter Pearse wrote: > > -----Original Message----- > > From: Magnus Lilja [mailto:[EMAIL PROTECTED] > > Sent: 10 April 2008 12:53 > > To: Wolfgang Denk > > Cc: Peter Pearse; Guennadi Liakhovetski; > > u-boot-users@lists.sourceforge.net > > Subject: Re: [U-Boot-Users] [GIT PULL] Please pull u-boot-arm > > > > > I would expect, that the state of the current repository > > represents > > > what we get after applying Sascha's and Guennadi's patches (in the > > > correct versions and order). Howver, the current tree looks > > totally > > > different to me. > > > > There are some vital differences between the current git > > trees (both the ARM tree and the main tree) and the tree one > > gets after applying the patches manually (from the posts here > > on the list). > > > > Thanks Magnus > > I see that in correcting the formats of the patches I have neglected > to > correct the line counts for new files, thus losing the final lines of the > file. > > Applying your patch now
Sorry, do I understand it right, that you are going to keep your patches as you have committed them and now apply this patch from Magnus on the top? If yes, I don't think this is a correct decision. I think, you should revert your commits and re-apply the original unchanged patches. Thanks Guennadi --- Guennadi Liakhovetski ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone _______________________________________________ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
