[Pkg-jed-commit] [SCM] www branch, master, updated. 49bac2bb7e8e058a4c5836c03865d5571678eb40
Rafael Laboissiere
rafael at debian.org
Sun Apr 26 14:26:58 UTC 2009
The following commit has been merged in the master branch:
commit c76fc7870b13965d2ad645b4f1339e621e1de1bc
Author: Rafael Laboissiere <rafael at debian.org>
Date: Sun Apr 26 16:24:28 2009 +0200
Fix reStructuredText markup
diff --git a/DJG-Guidelines.txt.in b/DJG-Guidelines.txt.in
index a189e03..bbf00d9 100644
--- a/DJG-Guidelines.txt.in
+++ b/DJG-Guidelines.txt.in
@@ -193,14 +193,14 @@ this::
In the GIT repositories we track in the branch "upstream" the upstream
source and in the branch "master" we track the package development. For
-this we merge in the upstream branch on a regular basis.
+this we merge in the upstream branch on a regular basis.::
+---o---D---o---o---o---E---+---o---o---F master
/ /
U---o---o-----------o---o---V upstream
- U and V are upstream releases, D, E and F are Debian releases and the +
- are merges of the upstream branch in the master branch.
+U and V are upstream releases, D, E and F are Debian releases and the +
+are merges of the upstream branch in the master branch.
This way you can checkout the master branch and build the current version
or start hacking the source.
@@ -214,7 +214,7 @@ only list files in the subdirectory "debian."
4.1 One Debian release cycle
----------------------------
-Make sure you have the most up to date files with
+Make sure you have the most up to date files with::
git fetch (for Debian sources)
git svn fetch (for upstream sources, if upstream uses SVN)
@@ -222,7 +222,7 @@ Make sure you have the most up to date files with
You should checkout your master branch [1] and import the last changes
[2] from the central GIT repository by merging. This should result in a
fast forward merge. Otherwise something is broken. You should ask for
-help on the mailinglist or throw your changes away [3].
+help on the mailinglist or throw your changes away [3]::
git checkout master [1]
git merge origin/master [2]
@@ -235,11 +235,11 @@ import the recent upstream changes and start a new version, e.g. 1.3-1.
-------------------
When you start a new version, you have to merge the current upstream
-source into the master branch.
+source into the master branch.::
git merge upstream
-Now you are here:
+Now you are here:::
+---o---D---+ master
/ /
@@ -248,39 +248,39 @@ Now you are here:
The first commit in the new cycle must be a change of the file
debian/changelog that starts a new Debian version, regardless if it a new
Debian version or a new upstream version. Edit the file [1], add it to the
-GIT index [2] and make the commit [3].
+GIT index [2] and make the commit [3].::
xjed debian/changelog [1]
git add debian/changelog [2]
git commit -m "Start a new version" [3]
-The commit should look similar to this
+The commit should look similar to this::
-% git show
-commit ca731f5f39b5b8982a8b38d04b569c1fedf9c45b
-Author: Jörg Sommer <joerg at alea.gnuu.de>
-Date: Sat Apr 26 10:56:20 2008 +0200
+ % git show
+ commit ca731f5f39b5b8982a8b38d04b569c1fedf9c45b
+ Author: Joerg Sommer <joerg at alea.gnuu.de>
+ Date: Sat Apr 26 10:56:20 2008 +0200
- Start a new version
+ Start a new version
-diff --git a/debian/changelog b/debian/changelog
-index f1ccf3b..1f95cae 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -1,3 +1,10 @@
-+slrn (0.9.9~pre102-1) UNRELEASED; urgency=low
-+
-+ * This packages is based on the svn snapshot from
-+ https://slrn.svn.sourceforge.net/svnroot/slrn/trunk
-+
-+ -- Jörg Sommer <joerg at alea.gnuu.de> Thu, 01 Jan 1970 00:00:00 +0000
-+
- slrn (0.9.9~pre99-1) unstable; urgency=high
+ diff --git a/debian/changelog b/debian/changelog
+ index f1ccf3b..1f95cae 100644
+ --- a/debian/changelog
+ +++ b/debian/changelog
+ @@ -1,3 +1,10 @@
+ +slrn (0.9.9~pre102-1) UNRELEASED; urgency=low
+ +
+ + * This packages is based on the svn snapshot from
+ + https://slrn.svn.sourceforge.net/svnroot/slrn/trunk
+ +
+ + -- Joerg Sommer <joerg at alea.gnuu.de> Thu, 01 Jan 1970 00:00:00 +0000
+ +
+ slrn (0.9.9~pre99-1) unstable; urgency=high
- * This packages is based on the svn snapshot from
+ * This packages is based on the svn snapshot from
Now, you should start a new branch for the changes you want to do. Name
-it work-$YOUR_SIGN.
+it work-$YOUR_SIGN.::
git checkout -b work-$ME
@@ -292,30 +292,31 @@ this, e.g. update the dpatches.
After you brought the package in shape, you should start making other
changes. But keep the following commit policy in mind:
-· The package must build after every commit---except of the first few
+
+* The package must build after every commit---except of the first few
commits of a new cycle needed to bring the package in shape.
-· Every commit should change only one thing. Don't so summary commits.
+* Every commit should change only one thing. Don't so summary commits.
GIT is a distributed VCS and you can commit every time. It's not SVN!
-· Do all changes needed for a change, e.g. update the debian/changelog,
+* Do all changes needed for a change, e.g. update the debian/changelog,
if necessary, update debian/patches/00list and so on. Ask yourself the
question: "If my change gets reverted, is it enough to revert this
patch?"
-· Describe in the commit message, what you want to do and why you want to
+* Describe in the commit message, what you want to do and why you want to
do it. You have much more space in the commit message than in the
Debian changelog. You can put statistics there or explain design
decisions.
-· Don't update the timestamp in the changelog file. Changing the
+* Don't update the timestamp in the changelog file. Changing the
timestamp with every commit clutters the diff and might cause problem
on merging and cherry-picking.
To make a commit you must add the changed files to the GIT index. You can
use add whole files [1] or only parts [2]. After this you can view the
changes [3] and commit them [4]. You can also combine the steps [1] and
-[4] to [5] or [2] an [4] to [6].
+[4] to [5] or [2] an [4] to [6].::
git add debian/rules [1]
git add -i [2]
@@ -329,18 +330,18 @@ changes [3] and commit them [4]. You can also combine the steps [1] and
The history shouldn't look like this:
-· dpatch to support something
-· sorry, I forgot the 00list file, here is it
-· make funny stuff
-· changelog entry for something above
-· improve spelling of funny stuff
+* dpatch to support something
+* sorry, I forgot the 00list file, here is it
+* make funny stuff
+* changelog entry for something above
+* improve spelling of funny stuff
GIT gives you the tools to fix the history of your branch
"work-$YOUR_SIGN." Don't do this in the branch "master!"
You can change the last commit with the option --amend [1] or you can use
rebase [2] to make changes like joining, reordering, removing and editing
-of commits.
+of commits.::
git commit --amend [1]
git rebase -i HEAD~10 [2]
@@ -353,7 +354,7 @@ commits at a time and there can be days between the commit and the
publishing. You have enough time to think about what you have done and
maybe change it!
-After you have done your changes, you should publish them by running
+After you have done your changes, you should publish them by running::
git push
@@ -365,42 +366,41 @@ If you used rebase you must use the option --force.
After all is in shape and the changes are reviewed by the other team
members, someone should step up and make the release. He should merge [2]
missing commits in the master branch [1] and do the final commit by
-updating the Debian changelog [2] and add a tag [3]. After this is
+updating the Debian changelog [2] and add a tag [3]. After this is::
git checkout master [1]
git merge work-$X [2]
git commit debian/changelog [3]
git tag 1.3-1 [4]
-The final commit should look like this one:
-
-commit 1c95c225679ff863d29d21f50b6b1b0fe38a544f
-Author: Jörg Sommer <joerg at alea.gnuu.de>
-Date: Sat Apr 26 16:22:34 2008 +0200
+The final commit should look like this one:::
- Release of 0.9.9~pre102-1
+ commit 1c95c225679ff863d29d21f50b6b1b0fe38a544f
+ Author: Joerg Sommer <joerg at alea.gnuu.de>
+ Date: Sat Apr 26 16:22:34 2008 +0200
-diff --git a/debian/changelog b/debian/changelog
-index 591c5c4..d4e5168 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -1,4 +1,4 @@
--slrn (0.9.9~pre102-1) UNRELEASED; urgency=low
-+slrn (0.9.9~pre102-1) unstable; urgency=low
+ Release of 0.9.9~pre102-1
- * This packages is based on the svn snapshot from
- https://slrn.svn.sourceforge.net/svnroot/slrn/trunk
-@@ -40,7 +40,9 @@ slrn (0.9.9~pre102-1) UNRELEASED; urgency=low
- * Dropped the dpatch 206_branding, because I don't see what's the value
- of this patch except for fun.
+ diff --git a/debian/changelog b/debian/changelog
+ index 591c5c4..d4e5168 100644
+ --- a/debian/changelog
+ +++ b/debian/changelog
+ @@ -1,4 +1,4 @@
+ -slrn (0.9.9~pre102-1) UNRELEASED; urgency=low
+ +slrn (0.9.9~pre102-1) unstable; urgency=low
-- -- Jörg Sommer <joerg at alea.gnuu.de> Thu, 01 Jan 1970 00:00:00 +0000
-+ * Upload sponsored by Norbert Tretkowski
-+
-+ -- Jörg Sommer <joerg at alea.gnuu.de> Sat, 26 Apr 2008 16:19:22 +0200
+ * This packages is based on the svn snapshot from
+ https://slrn.svn.sourceforge.net/svnroot/slrn/trunk
+ @@ -40,7 +40,9 @@ slrn (0.9.9~pre102-1) UNRELEASED; urgency=low
+ * Dropped the dpatch 206_branding, because I don't see what's the value
+ of this patch except for fun.
- slrn (0.9.9~pre99-1) unstable; urgency=high
+ - -- Joerg Sommer <joerg at alea.gnuu.de> Thu, 01 Jan 1970 00:00:00 +0000
+ + * Upload sponsored by Norbert Tretkowski
+ +
+ + -- Joerg Sommer <joerg at alea.gnuu.de> Sat, 26 Apr 2008 16:19:22 +0200
+ slrn (0.9.9~pre99-1) unstable; urgency=high
(`view source`_)
(`PDF version`_)
--
www
More information about the Pkg-jed-commit
mailing list