[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Sun, 17 Jan 2010 12:20:18 +0100
Whew, this was annoying. I wanted to finally rotate ChangeLog files.
Merging a patch to this end from maint to branch-1.11 and master is
nontrivial, however: we want the respective ChangeLog.09 files to
contain what used to be in the respective branch's ChangeLog contents,
not that of the maint branch. I tried a few variations, including doing
the rotation separately on each branch, but that would only lead to lots
more confusion in later merges from maint. So finally I resorted to a
rotation patch on maint, and a couple of fake merges of that to master
and branch-1.11, ensuring that ChangeLog.09 contents are as expected.
* ChangeLog.09: New file, rotated from ...
* ChangeLog: ... here.
* Makefile.am (EXTRA_DIST): Distribute ChangeLog.09.
diff --git a/ChangeLog b/ChangeLog
index 063c06b..4c62567 100644
@@ -1,5520 +1,13 @@
diff --git a/ChangeLog.09 b/ChangeLog.09
new file mode 100644
diff --git a/Makefile.am b/Makefile.am
index e9e7e74..d176d7b 100644
@@ -3,7 +3,7 @@
## Makefile for Automake.
# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -39,6 +39,7 @@ EXTRA_DIST = \
+ ChangeLog.09 \
|[Prev in Thread]
||[Next in Thread]|
- Rotate ChangeLog,
Ralf Wildenhues <=