From mboxrd@z Thu Jan 1 00:00:00 1970 From: wmorgan-sup@masanjin.net (William Morgan) Date: Tue, 22 Jan 2008 00:04:19 -0800 Subject: [sup-talk] 0.4 release plans and git comments Message-ID: <1200987860-sup-9887@south> Hi all, There've been enough bug fixes and other changes that I'm going to try to push 0.4 out the door over the next few days. I'll try and give a report of what features are in and which are still percolating in next. I realize now that I've been using Git wrong---I've been maintaining features as branches off of next, which has the effect that I can't easily merge a "topic" over to master without also merging in everything else that happened to be merged into next at an earlier point. So this might be a little messy. (But I've learned my lesson!) The upshot is that, if you submit a patches, it should typically be cut against master, not against next. (I'll update the wiki to reflect this.) Then I can merge topics into next just as before, but there's no false dependence between features introduced by Git. -- William