aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2007-09-13 02:42:57 +0800
committerChristian Persch <chpe@src.gnome.org>2007-09-13 02:42:57 +0800
commit638af2df837e0049c7f505443b1db27f9c3b2b2f (patch)
tree5a5be9aea71d80bff19452997efe83e641bf3552
parent85e48eed9e19e82448ad60d4252edec04ad8dbd0 (diff)
downloadgsoc2013-epiphany-638af2df837e0049c7f505443b1db27f9c3b2b2f.tar.gz
gsoc2013-epiphany-638af2df837e0049c7f505443b1db27f9c3b2b2f.tar.zst
gsoc2013-epiphany-638af2df837e0049c7f505443b1db27f9c3b2b2f.zip
Move old ChangeLog to ChangeLog-20070912, and dist it.
Update HACKING file for no-ChangeLog policy. svn path=/trunk/; revision=7394
-rw-r--r--ChangeLog-20070912 (renamed from ChangeLog)0
-rw-r--r--HACKING38
-rw-r--r--Makefile.am10
3 files changed, 28 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog-20070912
index bc5770ddd..bc5770ddd 100644
--- a/ChangeLog
+++ b/ChangeLog-20070912
diff --git a/HACKING b/HACKING
index 433872104..8264d7ae9 100644
--- a/HACKING
+++ b/HACKING
@@ -13,24 +13,26 @@ need to stick to in order to get your patch accepted:
* bla_bla_cb: This is an example comment block
*/
-When submitting a patch or committing to cvs do not forget
-to write a Changelog entry. Please put both a description
-and a reference to the bug (if there is one). Write your entry
-using UTF-8 encoding, and make sure your editor doesn't mangle
-the encoding of the ChangeLog file.
-
-
-Example of an entry:
-
-2004-02-19 Christian Persch <chpe@cvs.gnome.org>
-
- * lib/egg/egg-toolbar-editor.c: (toolbar_removed_cb),
- (egg_toolbar_editor_set_model), (egg_toolbar_editor_class_init),
- (update_actions_list), (egg_toolbar_editor_load_actions):
- * lib/egg/egg-toolbar-editor.h:
-
+SVN Checkin rules:
+
+When committing a patch to svn, you must use a checkin comment that fully
+describes the changes made. If the checkin is related to a bug, reference
+the bug number. Example:
+
When removing a toolbar, make its items available again in the toolbar
editor. (Bug #131182)
-Do NOT commit to this module without permission from me
-(marco@gnome.org)
+Checkin comments MUST use the UTF-8 encoding.
+
+If you forget to check in some changes that belonged in the same commit (e.g. omitted
+a file), you must copy the checkin comment from the previous, incomplete checkin, and
+additionally reference that commit's svn revision number. DO NOT use meaningless checkin
+comments such as "forgotten file" !
+If you make a major mistake in the checkin comment (e.g empty, or you've forgotten to cite
+the bug numbers), you must create a new checkin that touches all files the original checkin
+changed (just using whitespace changes is ok), and in the new checkin comment must note that
+this new checkin fixes the original checkin, referencing it by its SVN revision number.
+
+Do NOT commit to this module without permission from a maintainer. See the MAINTAINERS file
+for who they are.
+
diff --git a/Makefile.am b/Makefile.am
index 87c81a5cc..d8102fd26 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = lib embed src plugins data po help doc
ACLOCAL_AMFLAGS = -I m4
+NULL =
+
EXTRA_DIST = \
autogen.sh \
intltool-merge.in \
@@ -14,13 +16,16 @@ EXTRA_DIST = \
ChangeLog-20030925 \
ChangeLog-20040912 \
ChangeLog-20050828 \
- ChangeLog-20061106
+ ChangeLog-20061106 \
+ ChangeLog-20070912 \
+ $(NULL)
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update \
- gnome-doc-utils.make
+ gnome-doc-utils.make \
+ $(NULL)
DISTCHECK_CONFIGURE_FLAGS = \
--enable-python \
@@ -34,3 +39,4 @@ DISTCHECK_CONFIGURE_FLAGS = \
# Ignore gtk theme cache files on distcheck
distuninstallcheck_listfiles = find . -type f -print | grep -v 'icon-theme.cache'
+