editcomponents.cgi / process_bug.cgi conflict resolution

Wed Nov 17 09:24:44 UTC 2004

re: editcomponents: it was templatised, and at the same time it's use
of $::FORM was changed to use $cgi->param

I don't remember there being any other functional changes.

>>>>> "Kevin" == Kevin Benton <kevin.benton at amd.com> writes:

Kevin> Wow - I'm looking at what's changed in editcomponents.cgi
Kevin> versus 2.17.4 and I'm having a difficult time resolving the
Kevin> differences.  Anyone here have a pointer or two?  I actually
Kevin> have seven pages (not bad considering that it was over 90,000
Kevin> lines before I started) of unified diff output telling me what
Kevin> patch couldn't fix when it tried to help me resolve changes
Kevin> that were made here against 2.17.4 prior to my arrival.  Now
Kevin> that we're attempting to get current (->2.19.1), I don't have a
Kevin> frame of reference on how editcomponents.cgi changed or how to
Kevin> make the necessary changes.  I'm also trying to figure out the
Kevin> changes in process_bug.cgi near lines 94 - 105 (2.17.4).  Since
Kevin> we created our own assigned_todropdown field, my predecessor
Kevin> ended up using this area to insert his code to handle the
Kevin> dropdown.

Kevin> Kevin Benton

Kevin> Perl/Bugzilla Developer

Kevin> Advanced Micro Devices

Kevin> <html xmlns:o="urn:schemas-microsoft-com:office:office"
Kevin> xmlns:w="urn:schemas-microsoft-com:office:word"
Kevin> xmlns="http://www.w3.org/TR/REC-html40">

Kevin> <head> <meta http-equiv=Content-Type content="text/html;
Kevin> charset=us-ascii"> <meta name=Generator content="Microsoft Word
Kevin> 11 (filtered medium)"> <style> <!-- /* Style Definitions */
Kevin> p.MsoNormal, li.MsoNormal, div.MsoNormal {margin:0in;
Kevin> margin-bottom:.0001pt; font-size:12.0pt; font-family:"Times New
Kevin> Roman";} a:link, span.MsoHyperlink {color:blue;
Kevin> text-decoration:underline;} a:visited,
Kevin> span.MsoHyperlinkFollowed {color:purple;
Kevin> text-decoration:underline;} span.EmailStyle17
Kevin> {mso-style-type:personal-compose; font-family:Arial;
Kevin> color:windowtext;} @page Section1 {size:8.5in 11.0in;
Kevin> margin:1.0in 1.25in 1.0in 1.25in;} div.Section1
Kevin> {page:Section1;}
-->
Kevin> </style>

Kevin> </head>

Kevin> <body lang=EN-US link=blue vlink=purple>

Kevin> <div class=Section1>

Kevin> <p class=MsoNormal><font size=2 face=Arial><span
Kevin> style='font-size:10.0pt; font-family:Arial'>Wow –
Kevin> I’m looking at what’s changed in editcomponents.cgi
Kevin> versus 2.17.4 and I’m having a difficult time resolving
Kevin> the differences.  Anyone here have a pointer or two? 
Kevin> I actually have seven pages (not bad considering that it was
Kevin> over 90,000 lines before I started) of unified diff output
Kevin> telling me what patch couldn’t fix when it tried to help
Kevin> me resolve changes that were made here against 2.17.4 prior to
Kevin> my arrival.  Now that we’re attempting to get
Kevin> current (->2.19.1), I don’t have a frame of reference
Kevin> on how editcomponents.cgi changed or how to make the necessary
Kevin> changes.  I’m also trying to figure out the changes
Kevin> in process_bug.cgi near lines 94 – 105 (2.17.4). 
Kevin> Since we created our own assigned_todropdown field, my
Kevin> predecessor ended up using this area to insert his code to
Kevin> handle the dropdown.<o:p></o:p></span></font></p>

Kevin> <p class=MsoNormal><font size=2 face=Arial><span
Kevin> style='font-size:10.0pt;
Kevin> font-family:Arial'><o:p> </o:p></span></font></p>

Kevin> <div>

Kevin> <p class=MsoNormal><font size=2 face=Arial><span
Kevin> style='font-size:10.0pt; font-family:Arial'>Kevin
Kevin> Benton</span></font><o:p></o:p></p>

Kevin> </div>

Kevin> <div>

Kevin> <p class=MsoNormal><font size=2 face=Arial><span
Kevin> style='font-size:10.0pt; font-family:Arial'>Perl/Bugzilla
Kevin> Developer</span></font><o:p></o:p></p>

Kevin> </div>

Kevin> <div>

Kevin> <p class=MsoNormal><font size=2 face=Arial><span
Kevin> style='font-size:10.0pt; font-family:Arial'>Advanced Micro
Kevin> Devices</span></font><o:p></o:p></p>

Kevin> </div>

Kevin> <div>

Kevin> <p class=MsoNormal><font size=3 face="Times New Roman"><span
Kevin> style='font-size: 12.0pt'> </span><o:p></o:p></font></p>

Kevin> </div>

Kevin> <p class=MsoNormal><font size=3 face="Times New Roman"><span
Kevin> style='font-size: 12.0pt'><o:p> </o:p></span></font></p>

Kevin> </div>

Kevin> </body>

Kevin> </html>