Merge remote-tracking branch 'origin/v1.0'

Conflicts:
	content.tex
	makediff.sh

git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/trunk@477 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652

1 files changed, 23 insertions, 10 deletions

diff --git a/makediff.sh b/makediff.sh
index 60133a8..16eba2d 100755
--- a/makediff.sh
+++ b/makediff.sh
@@ -9,19 +9,32 @@ export DATESTR=${DATESTR:-`cat REVISION-DATE`}
 MAIN=$1
 PATH=.:${PATH}
 cur="$PWD"
+oldrev=`git rev-list -1 origin/tags/v1.0-cs01`
+newrev=`git rev-list -1 HEAD`
 rm -fr old new
 git clone $PWD old
 cd "${cur}/old"
-git checkout 40ba29870a685004fc4d4458778bcd038f200524
-#suppress diff of title
-git cherry-pick 0adee486ab987c3e98c5f31b51cc963d8bb6fff4
-#suppress diff of changelog
-git cherry-pick a41f3813a748e7d279cb6eb82f3c0afde4a3243a
-git cherry-pick fbfb402e69cdd9279c44b7684612e6f81df99e6d
-git cherry-pick 9f240fe0e718bf9b1e502e02916db9d8fede304b
-git cherry-pick a02605f9945f450ecaadf86736741de2e2c2e788
-git cherry-pick 175e797beede8aea840102bee9b70bb08190153d
-
+git checkout $oldrev
+##suppress diff of title
+#git cherry-pick 0adee486ab987c3e98c5f31b51cc963d8bb6fff4
+##suppress diff of changelog
+#git cherry-pick a41f3813a748e7d279cb6eb82f3c0afde4a3243a
+#git cherry-pick fbfb402e69cdd9279c44b7684612e6f81df99e6d
+#git cherry-pick 9f240fe0e718bf9b1e502e02916db9d8fede304b
+#git cherry-pick a02605f9945f450ecaadf86736741de2e2c2e788
+#git cherry-pick 175e797beede8aea840102bee9b70bb08190153d
+while read -r rev; do
+	echo "Applying $rev"
+	git cherry-pick `git rev-list -1 -F --grep "$rev" $newrev` || exit 1
+done << 'EOF'
+formatting: escape \ldots in lstlisting
+formatting: mark change manually as changed in cs02
+cl: remove changelog for cs01
+cl-os: prepare changelog for v1.0 cs02
+title: update previous version to cs01
+changelog: list acknowledgement change
+changelog: typo fixup: formatting: formatting
+EOF
 
 #mv specvars.tex specvars-orig.tex
 #make links green to avoid confusion