From b76aef36e43b5444e87de5a4ce273f6af346a8e1 Mon Sep 17 00:00:00 2001 From: mstsirkin Date: Sun, 11 Oct 2015 15:13:22 +0000 Subject: cl: clear it out for cs03 Signed-off-by: Michael S. Tsirkin git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@543 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652 --- makediff.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'makediff.sh') diff --git a/makediff.sh b/makediff.sh index 7d64c93..d7df5d0 100755 --- a/makediff.sh +++ b/makediff.sh @@ -9,7 +9,7 @@ export DATESTR=${DATESTR:-`cat REVISION-DATE`} MAIN=$1 PATH=.:${PATH} cur="$PWD" -oldrev=`git rev-list -1 origin/tags/v1.0-cs02` +oldrev=`git rev-list -1 origin/tags/v1.0-cs03` newrev=`git rev-list -1 HEAD` rm -fr old new git clone $PWD old @@ -19,11 +19,6 @@ while read -r rev; do echo "Applying $rev" git cherry-pick `git rev-list -1 -F --grep "$rev" $newrev` || exit 1 done << 'EOF' -Revert: formatting: mark change manually as changed in cs02 -cl: move out cs02 changelog -cl: drop contents temporarily -changelog: comment out header -changelog: disable markup EOF #mv specvars.tex specvars-orig.tex -- cgit v1.2.3 From a510be931481d7cf08e9f9a055f815e9fca11a50 Mon Sep 17 00:00:00 2001 From: mstsirkin Date: Tue, 16 Feb 2016 17:12:41 +0000 Subject: makediff: cherry pick file name change Signed-off-by: Michael S. Tsirkin git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@563 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652 --- makediff.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'makediff.sh') diff --git a/makediff.sh b/makediff.sh index d7df5d0..71b640e 100755 --- a/makediff.sh +++ b/makediff.sh @@ -19,6 +19,7 @@ while read -r rev; do echo "Applying $rev" git cherry-pick `git rev-list -1 -F --grep "$rev" $newrev` || exit 1 done << 'EOF' +headerfile: rename virtio_ring to virtio queue EOF #mv specvars.tex specvars-orig.tex -- cgit v1.2.3 From fed7c9840265d7a5f251db42f6ee6d0c3f67eee0 Mon Sep 17 00:00:00 2001 From: mstsirkin Date: Tue, 16 Feb 2016 18:09:33 +0000 Subject: makediff: suppress diff for chater names Temporary hack since we have nameref pointing to a chapter name, and that conflicts with latexdiff. Signed-off-by: Michael S. Tsirkin git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@566 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652 --- makediff.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'makediff.sh') diff --git a/makediff.sh b/makediff.sh index 71b640e..1dd75d4 100755 --- a/makediff.sh +++ b/makediff.sh @@ -52,6 +52,7 @@ sed 's/\\footnote{/\\footnote {/' new/flat.tex > new/flat-fixed.tex latexdiff-fast --config \ "FLOATENV=(?:figure|longtable|table|tabular|plate|lstlisting|note|enumerate|itemize)[\w\d*@]*,PICTUREENV=(?:picture|DIFdeltextcstwo|DIFnomarkup|lstlisting)[\w\d*@]*" \ --append-safecmd=field --append-textcmd=mmioreg \ + --exclude-textcmd=chapter \ --ignore-warnings -p diffpreamble.tex old/flat-fixed.tex \ new/flat-fixed.tex > virtio-diff-tofix.tex perl fixupdiff.pl virtio-diff-tofix.tex > virtio-diff.tex -- cgit v1.2.3