In article <[EMAIL PROTECTED]>, Marc Attinasi wrote: > > 64 layuout files had to be backed out on Wednesday. In the process, at > least one regression occurred because a later change was also backed out > accidentally (http://bugzilla.mozilla.org/show_bug.cgi?id=13553). > > Since we did not have time to check all 64 file for later checkins, it > is probably a good idea to verify that any changes you made to layout > since 1/20 have not been backed out by mistake. The files that were > backed out can be found here: I've tried to figure out how this happened, but it really shouldn't happen when backing out files. The command "cvs up -j<R1> -j<R2>" should merge in the delta between R1 and R2, so the bonsai-generated backout scripts should work (particularly when applied in reverse order, see bug 22346). However, to determine the damage, I started with a clean, current, tree and did a bonsai-script backout of the backout and then a bonsai-script backout of pierre's changes (plus nsLineLayout.cpp, which didn't show up on Bonsai as part of pierre's changes). This left me with merge conflicts in nsBlockFrame.cpp but no other diffs in layout. So I think this is probably the only error in the backout. -David -- L. David Baron <URL: http://www.people.fas.harvard.edu/~dbaron/ > Mozilla Contributor <URL: http://www.mozilla.org/ > Invited Expert, W3C CSS WG <URL: http://www.w3.org/Style/CSS/ >
