BIND 10 #3374: Component removal broken, Revert 3339 and 3373

[BIND 10 Development]

#3374: Component removal broken, Revert 3339 and 3373
-------------------------------------+-------------------------------------
            Reporter:  tmark         |                        Owner:  tmark
                Type:  defect        |                       Status:
            Priority:  high          |  reviewing
           Component:                |                    Milestone:  DHCP-
  configuration                      |  Kea0.9
            Keywords:                |                   Resolution:
           Sensitive:  0             |                 CVSS Scoring:
         Sub-Project:  DHCP          |              Defect Severity:  N/A
Estimated Difficulty:  0             |  Feature Depending on Ticket:
         Total Hours:  0.5           |          Add Hours to Ticket:  0.5
                                     |                    Internal?:  0
-------------------------------------+-------------------------------------
Changes (by tomek):

 * hours:  0 => 0.5
 * owner:  tomek => tmark
 * totalhours:  0 => 0.5


Comment:

 This ticket is reverting wrong commits, I'm afraid.

 There are 4 commits on branch trac3374:

 1. 6bf8a19728573e86e66b1ba9da1d7a606828e75f "trac3373" (oldest)
 2. d339f1979f995f611ce7aa130d2fe88f5450d9ab "trac3373"
 3. 5b30c7090341d4f4dc060c267af241d98ad07821 "trac3339"
 4. 44d6330d9283ca1e02e8e1f75fea90b18d7c1ba8 "trac3339" (newest)

 Comment for commit 1 claims:
 {{{
     This reverts commit da3b0d4f364d069ffdb47723545798ac589fae42,
 reversing
     changes made to ff46195513aff7b46efdd3c4d06bd777bc86c352.
 }}}
 But if you inspect it with gitk, it shows changes being done to unit-tests
 in src/lib/dhcpsrv. In fact, it looks like it removes all changes done in
 3359!

 Commit 2 looks ok (reverts 3373 as advertised).

 Commit 3 looks fine as well (seems to revert 3339 as advertised).

 Commit 4 is wrong. I was not able to precisely identify which changes it
 reverts, but I'm sure that it reverts 3322 (relay info override), among
 others.

 To easily see what the commits revert, I used gitk tool, which is nice,
 easy to use, graphical tool.

 To eliminate any doubts, I also used normal git diff and compared
 differences between commits.

 I'm not sure what to do with this. One possible strategy would be to get
 rid of the trac3374 branch altogether and start from scratch. I have never
 used git revert, so I'm afraid I can't offer any guidance here.

-- 
Ticket URL: <http://bind10.isc.org/ticket/3374#comment:4>
BIND 10 Development <http://bind10.isc.org>
BIND 10 Development