diff options
| author | mstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652> | 2014-12-23 19:27:08 +0000 |
|---|---|---|
| committer | mstsirkin <mstsirkin@0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652> | 2014-12-23 19:27:08 +0000 |
| commit | d54bb60e6490d78981424e9b65a9bf84bdb9b5bf (patch) | |
| tree | 5a773b8f6d114a2baeff9daa60053e02624a9186 /makediff.sh | |
| parent | 3c9def2db8a414a427fc06171a7c932831720dfb (diff) | |
makediff: cherry-pick some changes to avoid markup
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@462 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652
Diffstat (limited to 'makediff.sh')
| -rwxr-xr-x | makediff.sh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/makediff.sh b/makediff.sh index 168c9f7..692c90d 100755 --- a/makediff.sh +++ b/makediff.sh @@ -10,6 +10,7 @@ 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" @@ -22,12 +23,15 @@ git checkout $oldrev #git cherry-pick 9f240fe0e718bf9b1e502e02916db9d8fede304b #git cherry-pick a02605f9945f450ecaadf86736741de2e2c2e788 #git cherry-pick 175e797beede8aea840102bee9b70bb08190153d -git cherry-pick d858fdbad24c7e8c90552ecc1f4e963c378dadf2 -git cherry-pick fc666b6f4b9152c9eb62c48ae8a402d4223de2c4 -git cherry-pick 7f85bbb585e0d63f7ac8ff1a3ac22fc3370c50ac -git cherry-pick ae8f2dd -git cherry-pick bf266a7 - +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 +EOF #mv specvars.tex specvars-orig.tex #make links green to avoid confusion |