From 578b7e26f4991adfef3fb41c6222df50f175be50 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge <tschwinge@gnu.org> Date: Sat, 25 Jul 2009 12:15:35 +0200 Subject: community/weblogs/ArneBab/howto-news-month-of-the-hurd -> contributing/web_pages/news This page is based on emails by Arne Babenhauserheide (<200907081238.33005.arne_bab@web.de>, 2009-07-08) and Thomas Schwinge (<20090709091037.GY23964@fencepost.gnu.org>, 2009-07-09). --- .../ArneBab/howto-news-month-of-the-hurd.mdwn | 54 ---------------------- 1 file changed, 54 deletions(-) delete mode 100644 community/weblogs/ArneBab/howto-news-month-of-the-hurd.mdwn (limited to 'community/weblogs/ArneBab/howto-news-month-of-the-hurd.mdwn') diff --git a/community/weblogs/ArneBab/howto-news-month-of-the-hurd.mdwn b/community/weblogs/ArneBab/howto-news-month-of-the-hurd.mdwn deleted file mode 100644 index f365bc79..00000000 --- a/community/weblogs/ArneBab/howto-news-month-of-the-hurd.mdwn +++ /dev/null @@ -1,54 +0,0 @@ -[[!meta copyright="Copyright © 2009 Free Software Foundation, Inc."]] - -[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable -id="license" text="Permission is granted to copy, distribute and/or modify this -document under the terms of the GNU Free Documentation License, Version 1.2 or -any later version published by the Free Software Foundation; with no Invariant -Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license -is included in the section entitled [[GNU Free Documentation -License|/fdl]]."]]"""]] - -[[!meta title="HowTo prepare and publish 'a month of the Hurd' for the next month"]] - -We prepare the month of the Hurd in a public git branch (master-news_next) and merge it once we want to publish the news. - -For practical work that means, we use the following commands: - -* create a local branch for news_next - - git fetch && git checkout -b master-news_next origin/master-news_next - -* get the latest version of news_next when you already created a local version of the branch - - git fetch && git checkout master-news_next - -Always do check which branch you're on (asterisk in the first column of -``git branch'''s output), and only then begin to do your changes and -commit them. - -* create a new news entry - - cp news/yyyy-mm-dd.mdwn news/YYYY-MM-DD.mdwn - (edit the new file) - git add news/YYYY-MM-DD.mdwn - git commit -m "Begun the news entry for YYYY-MM-DD." - -(just copy the most recent news file) - -* check the outgoing changes - - git log --reverse -p -C origin/master-news_next..master-news_next - -* push the changes - - git push origin master-news_next:master-news_next - -* if push fails, pull and rebase - - git pull --rebase - -* publish the news - - git checkout master && git merge master-news_next - -That means, for publishing we merge master-news_next into master. -- cgit v1.2.3