BIND 10 #551: wildcard handling for memory zone: find (main cases)

[BIND 10 Development]

#551: wildcard handling for memory zone: find (main cases)
-------------------------------------+-------------------------------------
                 Reporter:  jinmei   |                Owner:  UnAssigned
                     Type:           |               Status:  reviewing
  enhancement                        |            Milestone:  A-Team-
                 Priority:  major    |  Sprint-20110223
                Component:  data     |           Resolution:
  source                             |            Sensitive:  0
                 Keywords:           |  Add Hours to Ticket:  0
Estimated Number of Hours:  8.0      |          Total Hours:  0
                Billable?:  1        |
                Internal?:  0        |
-------------------------------------+-------------------------------------

Comment (by vorner):

 I'm not sure if it is the easiest way, but I know of three ways:
  - Diff the part before the merge and after the merge separately. It's not
 much of a solution, more like ignoring the problem.
  - Create a temporary branch over master and rebase/cherry-pick everything
 except the merge there. That way you can view the changes, but is maybe
 little bit overkill.
  - Create a temporary branch over master and merge the reviewed branch
 into it, then diff against master. That way you view the changes that the
 merge does, for example this way (I believe this one is most accurate and
 is quite easy):

 {{{
 git checkout origin/master -b temporary --no-track
 git merge origin/trac551
 git diff origin/master
 }}}

 (The --no-track is there to stop the temporary branch from tracking
 master. It's not actually needed for anything, but ensures that if you
 typed git push by accident, it does not push the temporary merge to
 master).

 You can then remove the branch:

 {{{
 git checkout master
 git branch -D temporary
 }}}

 Maybe I should document this on the workflow page.

-- 
Ticket URL: <https://bind10.isc.org/ticket/551#comment:5>
BIND 10 Development <http://bind10.isc.org>
BIND 10 Development