* [sup-talk] 0.4 release plans and git comments
@ 2008-01-22 8:04 William Morgan
2008-01-23 6:42 ` William Morgan
0 siblings, 1 reply; 4+ messages in thread
From: William Morgan @ 2008-01-22 8:04 UTC (permalink / raw)
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 <wmorgan-sup at masanjin.net>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [sup-talk] 0.4 release plans and git comments
2008-01-22 8:04 [sup-talk] 0.4 release plans and git comments William Morgan
@ 2008-01-23 6:42 ` William Morgan
2008-01-23 6:57 ` Richard Heycock
0 siblings, 1 reply; 4+ messages in thread
From: William Morgan @ 2008-01-23 6:42 UTC (permalink / raw)
Reformatted excerpts from William Morgan's message of 2008-01-22:
> 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.
Everything that was applied to next is now in master. 0.4 release
imminent!
> 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.
I've updated the wiki with better Git instructions.
--
William <wmorgan-sup at masanjin.net>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [sup-talk] 0.4 release plans and git comments
2008-01-23 6:42 ` William Morgan
@ 2008-01-23 6:57 ` Richard Heycock
2008-01-23 18:18 ` William Morgan
0 siblings, 1 reply; 4+ messages in thread
From: Richard Heycock @ 2008-01-23 6:57 UTC (permalink / raw)
Excerpts from William Morgan's message of Wed Jan 23 17:42:15 +1100 2008:
> Reformatted excerpts from William Morgan's message of 2008-01-22:
> > 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.
>
> Everything that was applied to next is now in master. 0.4 release
> imminent!
And the release notes ...
:-)
By the way I've just started using sup. Lovin' it!
rgh
> > 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.
>
> I've updated the wiki with better Git instructions.
>
--
You're worried criminals will continue to penetrate into cyberspace, and
I'm worried complexity, poor design and mismanagement will be there to meet
them - Marcus Ranum
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-01-23 18:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-01-22 8:04 [sup-talk] 0.4 release plans and git comments William Morgan
2008-01-23 6:42 ` William Morgan
2008-01-23 6:57 ` Richard Heycock
2008-01-23 18:18 ` William Morgan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox