On Wed, 24 Feb 2016, Martin Winter wrote:
applied patch [probably wrong] on top of the last commit. Rebase made
it impossible to pull a new copy as I usually do for each run)
I think the lesson from round-6 is to use separate branches when it
makes sense and merge, rather than have it all in a 'ff' branch that
ends up being rebased and not fast-forwardable.
Maybe we need to keep patches from each contributor in a separate branch
under proposed/$R/ - each forking from the previous master. You could
test each branch independently and pass/fail them. Any that pass can be
pulled into the 'ff' branch either.
Or whatever would make life easier for testing.
Though, I'm not a huge fan of massive octupus-tentacled parallel
branches in the main history either. So, perhaps a final rebase to
linearlise 'ff' and final all-to-gether test before end of round would
still be an idea.
regards,
--
Paul Jakma [email protected] @pjakma Key ID: 64A2FF6A
Fortune:
"If you lived today as if it were your last, you'd buy up a box of rockets and
fire them all off, wouldn't you?"
-- Garrison Keillor
_______________________________________________
Quagga-dev mailing list
[email protected]
https://lists.quagga.net/mailman/listinfo/quagga-dev
