Differences

This shows you the differences between two versions of the page.

--- soc:2011:pcmattman:journal:week4 [2011/06/15 06:18]
pcmattman day 3 journal
+++ soc:2011:pcmattman:journal:week4 [2011/06/17 06:28] (current)
pcmattman day 5 journal entry
@@ Line 20: / Line 20: @@
 [[http://git.etherboot.org/people/pcmattman/gpxe.git/commit/aa681cf20b0bccfd33afc2cdfd4df05dcebb2825|Tonight and yesterday's work]] - mainly getting dhcp6.h filled out as I read through the RFC. Hopefully I can start getting some code down soon - I'll definitely need to read the DHCPv4 code to get an idea of how to make things work. Certainly looking forward to throwing some DHCPv6 packets onto my network though!
+==== Day 4 (June 16) ====
+Maintenance at work this evening and some other issues with hardware at work turned this evening into a write-off for gPXE work.
+==== Day 5 (June 17) ====
+Looked at merging and rearranging some commits today ready for submission upstream for testing. After a few hours of dealing with conflicts and continuously breaking builds I've decided to wait a bit and work on the merging some time later. I really need to figure out how best to work from now on so merging and rearranging for upstream won't be so painful in the future. I'm almost certain I won't be able to avoid rearranging and merging altogether, as there's always some small bugfix later on which should be able to be merged with the original feature's commit, so I need to get this workflow working in a way that doesn't mean each upstream merge involves hours of work.

Trace: