On Fri, 11 Apr 2008, Wolfgang Denk wrote: > In message <[EMAIL PROTECTED]> you wrote: > > > > 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. > > I agree with Guennadi. The only solution is to throw away the current > state of the repository, and restart from the state before all the > corrupted patches were applied, adding clean, unmodified patches this > time.
Actually, I think, even Peter should not reset his tree, but revert just as well as you are going to do it: his tree is publically accessible too, and if he resets his tree, it will become unclear, where respective commits from the central tree come from. > As for the public U-Boot repository, where such a manipulation cannot > be done easily, I think I would like to revert the commits in > question, i. e. this list of commits: > > 066bebd6353e33af3adefc3404560871699e9961 > 7a837b7310166ae8fc8b8d66d7ef01b60a80f9d6 > c88ae20580b2b01487b4cdcc8b2a113f551aee36 > a147e56f03871bba4f05058d5e04ce7deb010b04 > d6674e0e2a6a1f033945f78838566210d3f28c95 > 8c8463cce44d849e37744749b32d38e1dfb12e50 > c98b47ad24b2d91f41c09a3d62d7f70ad84f4b7d > 8bf69d81782619187933a605f1a95ee1d069478d > 8c16cb0d3b971f46fbe77c072664c0f2dcd4471d > a574a73852a527779234e73e17e7597fd8128882 > 1377b5583a48021d983e1fd565f7d40c89e84d63 > 1704dc20917b4f71e373e2c888497ee666d40380 > > Comments welcome. Right, so, I think, Peter should do the same. Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: [EMAIL PROTECTED] ------------------------------------------------------------------------- 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 [email protected] https://lists.sourceforge.net/lists/listinfo/u-boot-users
