From 578b7e26f4991adfef3fb41c6222df50f175be50 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge 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). --- contributing/web_pages/news.mdwn | 54 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 contributing/web_pages/news.mdwn (limited to 'contributing/web_pages/news.mdwn') diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn new file mode 100644 index 00000000..f365bc79 --- /dev/null +++ b/contributing/web_pages/news.mdwn @@ -0,0 +1,54 @@ +[[!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 From 7d4412b20449299a8d4ead16969b440c590f9a3a Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 27 Jul 2009 12:33:12 +0200 Subject: Enhance page. Some formatting changes. Add some further content of other emails of mine (bug-hurd, 2009-07-07, <20090707171015.GX23964@fencepost.gnu.org>, and 2009-07-09, <20090709091037.GY23964@fencepost.gnu.org>). --- contributing/web_pages.mdwn | 2 + contributing/web_pages/news.mdwn | 95 +++++++++++++++++++++++++++++----------- 2 files changed, 72 insertions(+), 25 deletions(-) (limited to 'contributing/web_pages/news.mdwn') diff --git a/contributing/web_pages.mdwn b/contributing/web_pages.mdwn index db8ab4d6..e01a0040 100644 --- a/contributing/web_pages.mdwn +++ b/contributing/web_pages.mdwn @@ -52,7 +52,9 @@ pages will be more useful for everyone, especially for our own use. There are [[more detailed instructions about editing news items|news]]. + ## Staging Area + When you commit changes, either using the web interface or checking them in into the repository, they'll not become visible on diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index f365bc79..d6e25b87 100644 --- a/contributing/web_pages/news.mdwn +++ b/contributing/web_pages/news.mdwn @@ -8,47 +8,92 @@ 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"]] +[[!meta title="""How to prepare and publish "a month of the Hurd" for the last +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. +We prepare *a month of the Hurd* in a public git branch (`master-news_next`), +and merge that one into `master` once we want to publish the news. The idea is +to record to-be-published changes on that branch at they time they arise, and +then publish them en bloc at the end of the month. -For practical work that means, we use the following commands: +As this is done on a separate branch, there are two options: you can have +separate repositories (*clones*, or *checkouts*; what you get from `git clone`) +for the `master` and `master-news_next` branches, or you can deal with both in +the same repository. Having separate repositories you don't have to remember +which branch you're on, and don't have to switch between branches before +beginning to edit files, and it doesn't matter -- as no switching between +branches is needed -- if you have uncomitted changes to some files. On the +other hand, you may want to keep it all in one repository, to save disk space, +and for shuffling different branches' commits being (a bit) easier. -* create a local branch for news_next +For practical work that means to use the following commands: - git fetch && git checkout -b master-news_next origin/master-news_next + * create a local branch for `master-news_next` -* get the latest version of news_next when you already created a local version of the branch + $ git fetch + $ git checkout -b master-news_next origin/master-news_next - git fetch && git checkout master-news_next + * if you already have created a local branch `master-news_next`: update to + the latest version of it -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. + $ git checkout master-news_next + $ git pull --rebase -* create a new news entry + * edit - 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." + 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. -(just copy the most recent news file) + We should not update news items that have already been published (that is, + on ; no problem for the + [[staging area|web_pages#staging_area]]), as the system will always also + update the RSS feeds, etc., causing the old news item to reappear on feeds, + which is a bit of a nuisance. -* check the outgoing changes + * at the beginning of a month: create a new news entry - git log --reverse -p -C origin/master-news_next..master-news_next + $ cp news/2009-06-30.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." -* push the changes + That is, use the *2009-06-30* news snippet as a template for the new + one. - git push origin master-news_next:master-news_next + * check the outgoing changes -* if push fails, pull and rebase + $ git log --reverse -p -C origin/master-news_next..master-news_next - git pull --rebase + * push the changes -* publish the news + $ git push origin master-news_next - git checkout master && git merge master-news_next + * if push fails, pull and rebase the local changes on top of the remote + changes -That means, for publishing we merge master-news_next into master. + $ git pull --rebase + + This will only happen if someone else has been installing commits into + `origin`'s `master-news_next` branch since the last time you + synchronized to it. + + Note that this might cause some conflicts to arise -- if the remote + repository contains commits that conflict with any that you've been + recording in your local repository. For this reason, you might want to + already do this *rebase* before beginning you local edits, simply to + shorten the time frame in which such conflicts can arise. + (Theoretically, in the very rare case of very much concurrent editing + going on, you'd have to repeat this again (and again...) before + succeeding to push your changes.) + + * at the end of the month: publish the news + + $ git checkout master + $ git pull --rebase + $ git merge master-news_next + $ git push origin master + + That means, for publishing we merge `master-news_next` into `master`. + After that merge, work for the next month's news item can continue on + `master-news_next`. -- cgit v1.2.3 From c26d053a85a1e73d5096c35269cad8c3a8f19205 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Sat, 1 Aug 2009 18:24:29 +0200 Subject: news: added a note: commit and push often --- contributing/web_pages/news.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'contributing/web_pages/news.mdwn') diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index d6e25b87..7062359f 100644 --- a/contributing/web_pages/news.mdwn +++ b/contributing/web_pages/news.mdwn @@ -97,3 +97,5 @@ For practical work that means to use the following commands: That means, for publishing we merge `master-news_next` into `master`. After that merge, work for the next month's news item can continue on `master-news_next`. + +And since we're working in a branch anyway: Please commit often, push often and pull often! Few things would be nastier than having to do heavy merging on a enws release date with little time at hand. \ No newline at end of file -- cgit v1.2.3 From f3ce18edc806d916632a09eaa0826931290f2127 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 3 Aug 2009 10:07:56 +0200 Subject: Set date and updated meta values in news items. --- contributing/web_pages/news.mdwn | 12 +++++++++--- news/2009-07-31.mdwn | 4 ++++ 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'contributing/web_pages/news.mdwn') diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index 7062359f..4c09e1ab 100644 --- a/contributing/web_pages/news.mdwn +++ b/contributing/web_pages/news.mdwn @@ -53,12 +53,12 @@ For practical work that means to use the following commands: * at the beginning of a month: create a new news entry - $ cp news/2009-06-30.mdwn news/YYYY-MM-DD.mdwn + $ cp news/2009-07-31.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." - That is, use the *2009-06-30* news snippet as a template for the new + That is, use the *2009-07-31* news snippet as a template for the new one. * check the outgoing changes @@ -87,7 +87,13 @@ For practical work that means to use the following commands: going on, you'd have to repeat this again (and again...) before succeeding to push your changes.) - * at the end of the month: publish the news + * at the end of the month: prepare for publishing the news + + Edit the news entry's *meta date* and *meta updated* time values. For + stability, we set these two explicitly instead of relying on ikiwiki's + method of using the files' creation and modification dates. + + * ... and publish $ git checkout master $ git pull --rebase diff --git a/news/2009-07-31.mdwn b/news/2009-07-31.mdwn index aa78d7b5..11f1e3d6 100644 --- a/news/2009-07-31.mdwn +++ b/news/2009-07-31.mdwn @@ -8,6 +8,10 @@ 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 date="2009-08-03 08:00 UTC"]] + +[[!meta updated="2009-08-03 08:00 UTC"]] + A month of the Hurd: *hurd Debian package*, *union mount translator*, *bug fixes*, and a *job opening*. [[!if test="included()" then="""[[!toggle id=full_news -- cgit v1.2.3 From 1a0af957705bd43b72b4a2cbf5ac1836b7783733 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Wed, 14 Oct 2009 10:31:31 +0200 Subject: Improved wording in contributing/web_pages/news --- contributing/web_pages/news.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contributing/web_pages/news.mdwn') diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index 4c09e1ab..b8de20af 100644 --- a/contributing/web_pages/news.mdwn +++ b/contributing/web_pages/news.mdwn @@ -54,7 +54,7 @@ For practical work that means to use the following commands: * at the beginning of a month: create a new news entry $ cp news/2009-07-31.mdwn news/YYYY-MM-DD.mdwn - $ # edit the new file + $ # edit the new file, then add the changes in git $ git add news/YYYY-MM-DD.mdwn $ git commit -m "Begun the news entry for YYYY-MM-DD." -- cgit v1.2.3 From 6bc8d4259c69d1d919ff20a0ba35f3e445bf6461 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Wed, 14 Oct 2009 12:51:46 +0200 Subject: typo --- contributing/web_pages/news.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contributing/web_pages/news.mdwn') diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index b8de20af..a7cbe7a1 100644 --- a/contributing/web_pages/news.mdwn +++ b/contributing/web_pages/news.mdwn @@ -104,4 +104,4 @@ For practical work that means to use the following commands: After that merge, work for the next month's news item can continue on `master-news_next`. -And since we're working in a branch anyway: Please commit often, push often and pull often! Few things would be nastier than having to do heavy merging on a enws release date with little time at hand. \ No newline at end of file +And since we're working in a branch anyway: Please commit often, push often and pull often! Few things would be nastier than having to do heavy merging on a news release date with little time at hand. \ No newline at end of file -- cgit v1.2.3 From c8d9b04da3a0d6e0eb93b4de582c514d05fa6d14 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Thu, 15 Oct 2009 14:28:39 +0200 Subject: No more [[!meta updated=...]], but some more explanations. --- contributing/web_pages/news.mdwn | 9 ++++++--- news/2009-07-31.mdwn | 2 -- news/2009-09-30.mdwn | 2 -- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'contributing/web_pages/news.mdwn') diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index 4c09e1ab..ac7653a9 100644 --- a/contributing/web_pages/news.mdwn +++ b/contributing/web_pages/news.mdwn @@ -89,9 +89,12 @@ For practical work that means to use the following commands: * at the end of the month: prepare for publishing the news - Edit the news entry's *meta date* and *meta updated* time values. For - stability, we set these two explicitly instead of relying on ikiwiki's - method of using the files' creation and modification dates. + Edit the news entry's *meta date* value to the timestamp when the news + entry is [[published|news]]. We have to set that one manually, as + otherwise the timestamp of the news entry file's creation will be taken, + which is (much) earlier, and not what we want. We do not set the *meta + updated* value, as it's correct to update that one upon further + modifications of the news entries. * ... and publish diff --git a/news/2009-07-31.mdwn b/news/2009-07-31.mdwn index 11f1e3d6..21f09ae2 100644 --- a/news/2009-07-31.mdwn +++ b/news/2009-07-31.mdwn @@ -10,8 +10,6 @@ License|/fdl]]."]]"""]] [[!meta date="2009-08-03 08:00 UTC"]] -[[!meta updated="2009-08-03 08:00 UTC"]] - A month of the Hurd: *hurd Debian package*, *union mount translator*, *bug fixes*, and a *job opening*. [[!if test="included()" then="""[[!toggle id=full_news diff --git a/news/2009-09-30.mdwn b/news/2009-09-30.mdwn index 5deeb7f5..38f09bfa 100644 --- a/news/2009-09-30.mdwn +++ b/news/2009-09-30.mdwn @@ -10,8 +10,6 @@ License|/fdl]]."]]"""]] [[!meta date="2009-10-01 11:52 UTC"]] -[[!meta updated="2009-10-01 11:52 UTC"]] - A month of the Hurd: *Successful Google Summer of Code project: unionmount*. [[!if test="included()" then="""[[!toggle id=full_news text="Details."]][[!toggleable id=full_news text="[[!paste id=full_news]]"]]""" -- cgit v1.2.3 From c25b99ab435d8241ab247ef0d86b33b41457f6dd Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Mon, 25 Jan 2010 09:32:41 +0100 Subject: news: Added a news-skelleton page in contributing/web_pages and a note that the merge can be done more conveniently by using a small shell script. --- contributing/web_pages/news-skelleton.mdwn | 32 ++++++++++++++++++++++++++++++ contributing/web_pages/news.mdwn | 25 +++++++++++++++++++---- 2 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 contributing/web_pages/news-skelleton.mdwn (limited to 'contributing/web_pages/news.mdwn') diff --git a/contributing/web_pages/news-skelleton.mdwn b/contributing/web_pages/news-skelleton.mdwn new file mode 100644 index 00000000..8d888ea3 --- /dev/null +++ b/contributing/web_pages/news-skelleton.mdwn @@ -0,0 +1,32 @@ +[[!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 date="2010-01-31 00:00 UTC"]] + +[[!meta updated="2010-01-31 00:00 UTC"]] + +A month of the Hurd: **, ** and **. +[[!if test="included()" then="""[[!toggle id=full_news +text="Details."]][[!toggleable id=full_news text="[[!paste id=full_news]]"]]""" +else="[[!paste id=full_news]]"]] + +[[!cut id="full_news" text=""" +> This month +> +> Also +> +> Mainly thanks to +> +> Additionally +> +> And +> + +"""]] diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index f5cb4344..d79e710c 100644 --- a/contributing/web_pages/news.mdwn +++ b/contributing/web_pages/news.mdwn @@ -53,13 +53,14 @@ For practical work that means to use the following commands: * at the beginning of a month: create a new news entry - $ cp news/2009-07-31.mdwn news/YYYY-MM-DD.mdwn + $ cp news/2009-12-31.mdwn news/YYYY-MM-DD.mdwn $ # edit the new file, then add the changes in git $ git add news/YYYY-MM-DD.mdwn $ git commit -m "Begun the news entry for YYYY-MM-DD." - That is, use the *2009-07-31* news snippet as a template for the new - one. + That is, use the *2009-12-31* news snippet as a template for the new + one. Alternately you can use the [[news_skelleton|news-skelleton]] + *(contributing/web_pages/news-skelleton.mdwn)*. * check the outgoing changes @@ -107,4 +108,20 @@ For practical work that means to use the following commands: After that merge, work for the next month's news item can continue on `master-news_next`. -And since we're working in a branch anyway: Please commit often, push often and pull often! Few things would be nastier than having to do heavy merging on a news release date with little time at hand. \ No newline at end of file +And since we're working in a branch anyway: Please commit often, push often and pull often! Few things would be nastier than having to do heavy merging on a news release date with little time at hand. + +PS: If you're lazy, you can just use the following shell-script to merge the news into master: + +> \#!/bin/sh +> +> \# merge into master +> git checkout master +> git pull --rebase +> git merge master-news_next +> +> \# push master +> git push origin master +> +> \# switch back to master-news_next +> git checkout master-news_next +> git pull --rebase -- cgit v1.2.3 From c811b25017f7bd4f43d1f068a974812ae62e045b Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 25 Jan 2010 10:17:13 +0100 Subject: Fix spelling (skeleton), make it a subpage of news, only refer to skeleton, some fixes in the news skeleton. --- contributing/web_pages/news-skelleton.mdwn | 32 ----------------------------- contributing/web_pages/news.mdwn | 9 ++++---- contributing/web_pages/news/skeleton.mdwn | 33 ++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 contributing/web_pages/news-skelleton.mdwn create mode 100644 contributing/web_pages/news/skeleton.mdwn (limited to 'contributing/web_pages/news.mdwn') diff --git a/contributing/web_pages/news-skelleton.mdwn b/contributing/web_pages/news-skelleton.mdwn deleted file mode 100644 index 8d888ea3..00000000 --- a/contributing/web_pages/news-skelleton.mdwn +++ /dev/null @@ -1,32 +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 date="2010-01-31 00:00 UTC"]] - -[[!meta updated="2010-01-31 00:00 UTC"]] - -A month of the Hurd: **, ** and **. -[[!if test="included()" then="""[[!toggle id=full_news -text="Details."]][[!toggleable id=full_news text="[[!paste id=full_news]]"]]""" -else="[[!paste id=full_news]]"]] - -[[!cut id="full_news" text=""" -> This month -> -> Also -> -> Mainly thanks to -> -> Additionally -> -> And -> - -"""]] diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index d79e710c..a9a33170 100644 --- a/contributing/web_pages/news.mdwn +++ b/contributing/web_pages/news.mdwn @@ -1,4 +1,4 @@ -[[!meta copyright="Copyright © 2009 Free Software Foundation, Inc."]] +[[!meta copyright="Copyright © 2009, 2010 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 @@ -53,14 +53,13 @@ For practical work that means to use the following commands: * at the beginning of a month: create a new news entry - $ cp news/2009-12-31.mdwn news/YYYY-MM-DD.mdwn + $ cp contributing/web_pages/news/skeleton.mdwn news/YYYY-MM-DD.mdwn $ # edit the new file, then add the changes in git $ git add news/YYYY-MM-DD.mdwn $ git commit -m "Begun the news entry for YYYY-MM-DD." - That is, use the *2009-12-31* news snippet as a template for the new - one. Alternately you can use the [[news_skelleton|news-skelleton]] - *(contributing/web_pages/news-skelleton.mdwn)*. + That is, use the [[news_skelleton|skeleton]] as a template for the new + news snippet. * check the outgoing changes diff --git a/contributing/web_pages/news/skeleton.mdwn b/contributing/web_pages/news/skeleton.mdwn new file mode 100644 index 00000000..0d0af8de --- /dev/null +++ b/contributing/web_pages/news/skeleton.mdwn @@ -0,0 +1,33 @@ +[[!meta copyright="Copyright © 2010 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]]."]]"""]] + + + +A month of the Hurd: **, ** and **. +[[!if test="included()" then="""[[!toggle id=full_news +text="Details."]][[!toggleable id=full_news text="[[!paste id=full_news]]"]]""" +else="[[!paste id=full_news]]"]] + +[[!cut id="full_news" text=""" +> This month +> +> Also +> +> Mainly thanks to +> +> Additionally +> +> And +> + +"""]] -- cgit v1.2.3 From 75d3cec57800b933728ce10d58f4d02ad46f3b1f Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 25 Jan 2010 10:22:04 +0100 Subject: contributing/web_pages/news: Split out Arne's merge-news script. --- contributing/web_pages/news.mdwn | 18 +----------------- contributing/web_pages/news/merge-news | 13 +++++++++++++ 2 files changed, 14 insertions(+), 17 deletions(-) create mode 100644 contributing/web_pages/news/merge-news (limited to 'contributing/web_pages/news.mdwn') diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index a9a33170..a9a86d75 100644 --- a/contributing/web_pages/news.mdwn +++ b/contributing/web_pages/news.mdwn @@ -107,20 +107,4 @@ For practical work that means to use the following commands: After that merge, work for the next month's news item can continue on `master-news_next`. -And since we're working in a branch anyway: Please commit often, push often and pull often! Few things would be nastier than having to do heavy merging on a news release date with little time at hand. - -PS: If you're lazy, you can just use the following shell-script to merge the news into master: - -> \#!/bin/sh -> -> \# merge into master -> git checkout master -> git pull --rebase -> git merge master-news_next -> -> \# push master -> git push origin master -> -> \# switch back to master-news_next -> git checkout master-news_next -> git pull --rebase + Arne Babenhauserheide uses a [[merge-news]] script for doing this. diff --git a/contributing/web_pages/news/merge-news b/contributing/web_pages/news/merge-news new file mode 100644 index 00000000..33c01b7b --- /dev/null +++ b/contributing/web_pages/news/merge-news @@ -0,0 +1,13 @@ +#!/bin/sh + +# merge into master +git checkout master +git pull --rebase +git merge master-news_next + +# push master +git push origin master + +# switch back to master-news_next +git checkout master-news_next +git pull --rebase -- cgit v1.2.3 From 190bfb61a461742d00442519d91e84bf15b1c837 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 17 Sep 2010 14:50:15 +0200 Subject: contributing/web_pages/news: Add some places to watch. --- contributing/web_pages/news.mdwn | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'contributing/web_pages/news.mdwn') diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index a9a86d75..424c3848 100644 --- a/contributing/web_pages/news.mdwn +++ b/contributing/web_pages/news.mdwn @@ -61,6 +61,29 @@ For practical work that means to use the following commands: That is, use the [[news_skelleton|skeleton]] as a template for the new news snippet. + Watch these places for news: + + * GNU + + * *http://lists.gnu.org/archive/html/bug-hurd/YYYY-MM/threads.html* + * *http://lists.gnu.org/archive/html/commit-hurd/YYYY-MM/threads.html* + * *http://lists.gnu.org/archive/html/help-hurd/YYYY-MM/threads.html* + * *http://lists.gnu.org/archive/html/web-hurd/YYYY-MM/threads.html* + * *http://lists.gnu.org/archive/html/hurd-devel/YYYY-MM/threads.html* + * *http://sourceware.org/ml/libc-alpha/YYYY-MM/* + * (*http://sourceware.org/ml/libc-hacker/YYYY-MM/*) + * (*http://sourceware.org/ml/glibc-cvs/YYYY-qQ/*) + + * Debian + + * *http://lists.debian.org/debian-hurd/YYYY/MM/* + + * Arch Hurd + + * *http://www.archhurd.org/news.php* + * *http://planet.archhurd.org/* + * (*http://lists.archhurd.org/devel/maillist.html*) + * check the outgoing changes $ git log --reverse -p -C origin/master-news_next..master-news_next -- cgit v1.2.3 From dcda82f392bb9ca40984cd5f29ce202bc378fb39 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 22 Oct 2010 10:36:21 +0200 Subject: contributing/web_pages/news: Use news/YYYY-MM for the MotH. --- contributing/web_pages/news.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'contributing/web_pages/news.mdwn') diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index 424c3848..fa026529 100644 --- a/contributing/web_pages/news.mdwn +++ b/contributing/web_pages/news.mdwn @@ -53,12 +53,12 @@ For practical work that means to use the following commands: * at the beginning of a month: create a new news entry - $ cp contributing/web_pages/news/skeleton.mdwn news/YYYY-MM-DD.mdwn + $ cp contributing/web_pages/news/skeleton.mdwn news/YYYY-MM.mdwn $ # edit the new file, then add the changes in git - $ git add news/YYYY-MM-DD.mdwn - $ git commit -m "Begun the news entry for YYYY-MM-DD." + $ git add news/YYYY-MM.mdwn + $ git commit -m "Begun the news entry for YYYY-MM." - That is, use the [[news_skelleton|skeleton]] as a template for the new + That is, use the [[news skeleton|skeleton]] as a template for the new news snippet. Watch these places for news: -- cgit v1.2.3 From dd5f7212cbd505c780dcd43030fdcf2ff04e5e2e Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Sat, 23 Oct 2010 12:42:52 +0200 Subject: contributing/web_pages/news: Move places to watch to skeleton. --- contributing/web_pages/news.mdwn | 25 +-------------- contributing/web_pages/news/skeleton.mdwn | 53 ++++++++++++++++++++++++------- 2 files changed, 42 insertions(+), 36 deletions(-) (limited to 'contributing/web_pages/news.mdwn') diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index fa026529..a700c3ad 100644 --- a/contributing/web_pages/news.mdwn +++ b/contributing/web_pages/news.mdwn @@ -59,30 +59,7 @@ For practical work that means to use the following commands: $ git commit -m "Begun the news entry for YYYY-MM." That is, use the [[news skeleton|skeleton]] as a template for the new - news snippet. - - Watch these places for news: - - * GNU - - * *http://lists.gnu.org/archive/html/bug-hurd/YYYY-MM/threads.html* - * *http://lists.gnu.org/archive/html/commit-hurd/YYYY-MM/threads.html* - * *http://lists.gnu.org/archive/html/help-hurd/YYYY-MM/threads.html* - * *http://lists.gnu.org/archive/html/web-hurd/YYYY-MM/threads.html* - * *http://lists.gnu.org/archive/html/hurd-devel/YYYY-MM/threads.html* - * *http://sourceware.org/ml/libc-alpha/YYYY-MM/* - * (*http://sourceware.org/ml/libc-hacker/YYYY-MM/*) - * (*http://sourceware.org/ml/glibc-cvs/YYYY-qQ/*) - - * Debian - - * *http://lists.debian.org/debian-hurd/YYYY/MM/* - - * Arch Hurd - - * *http://www.archhurd.org/news.php* - * *http://planet.archhurd.org/* - * (*http://lists.archhurd.org/devel/maillist.html*) + news snippet. It also includes a list of the places to watch for news. * check the outgoing changes diff --git a/contributing/web_pages/news/skeleton.mdwn b/contributing/web_pages/news/skeleton.mdwn index 0d0af8de..8f08fba2 100644 --- a/contributing/web_pages/news/skeleton.mdwn +++ b/contributing/web_pages/news/skeleton.mdwn @@ -13,21 +13,50 @@ Will be set by tschwinge when publishing. [[!meta date="YYYY-MM-DD HH:MM UTC"]] --> -A month of the Hurd: **, ** and **. +A month of the Hurd: *TODO* / *TODO* / *TODO*. [[!if test="included()" then="""[[!toggle id=full_news text="Details."]][[!toggleable id=full_news text="[[!paste id=full_news]]"]]""" -else="[[!paste id=full_news]]"]] +else=" +[[!paste id=full_news]]"]] [[!cut id="full_news" text=""" -> This month -> -> Also -> -> Mainly thanks to -> -> Additionally -> -> And -> + +Watch these places for news: + + * GNU + + * + + * + + * + + * + + * + + * + + Also Git log. + + * () + + * () + + Better use the Git log. + + * Debian + + * + + * + + * Arch Hurd + + * + + * + + * () """]] -- cgit v1.2.3