From 5f50f6059e36786983f780829e97dda36626b671 Mon Sep 17 00:00:00 2001 From: mstsirkin Date: Mon, 22 Dec 2014 11:21:58 +0000 Subject: makediff: fix up using git-svn commit IDs It turns out makediff.sh used commit IDs that weren't pushed to svn. commit ID changes on dcommit so these don't work. Rewrite using correct commit IDs from git svn. Signed-off-by: Michael S. Tsirkin git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@446 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652 --- makediff.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'makediff.sh') diff --git a/makediff.sh b/makediff.sh index 541d6e3..60133a8 100755 --- a/makediff.sh +++ b/makediff.sh @@ -14,13 +14,13 @@ git clone $PWD old cd "${cur}/old" git checkout 40ba29870a685004fc4d4458778bcd038f200524 #suppress diff of title -git cherry-pick 42ef1dd895681a9b387d2c624771f1784c42a3d8 +git cherry-pick 0adee486ab987c3e98c5f31b51cc963d8bb6fff4 #suppress diff of changelog -git cherry-pick 2cf864d5659977040fdbc7a60f5e0530611f71da -git cherry-pick 523d7d957f4cd93c8b58a24f6bb6a3b4d64d0b99 -git cherry-pick de0a207286c4a53cc687e1c1a3409000d38be937 -git cherry-pick a279f7f7fcce55a00c4e419114f5171912ab17ae -git cherry-pick 94670c0396844e21dfbe1d8d9d43c60b81ae9790 +git cherry-pick a41f3813a748e7d279cb6eb82f3c0afde4a3243a +git cherry-pick fbfb402e69cdd9279c44b7684612e6f81df99e6d +git cherry-pick 9f240fe0e718bf9b1e502e02916db9d8fede304b +git cherry-pick a02605f9945f450ecaadf86736741de2e2c2e788 +git cherry-pick 175e797beede8aea840102bee9b70bb08190153d #mv specvars.tex specvars-orig.tex -- cgit v1.2.3 From 9b202acca2f6569c4ad5dcf709ec4c8335695b94 Mon Sep 17 00:00:00 2001 From: mstsirkin Date: Tue, 23 Dec 2014 19:26:29 +0000 Subject: makediff: works well. todo: fix commit ids git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@460 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652 --- makediff.sh | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'makediff.sh') diff --git a/makediff.sh b/makediff.sh index 60133a8..168c9f7 100755 --- a/makediff.sh +++ b/makediff.sh @@ -9,18 +9,24 @@ export DATESTR=${DATESTR:-`cat REVISION-DATE`} MAIN=$1 PATH=.:${PATH} cur="$PWD" +oldrev=`git rev-list -1 origin/tags/v1.0-cs01` 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 +git cherry-pick d858fdbad24c7e8c90552ecc1f4e963c378dadf2 +git cherry-pick fc666b6f4b9152c9eb62c48ae8a402d4223de2c4 +git cherry-pick 7f85bbb585e0d63f7ac8ff1a3ac22fc3370c50ac +git cherry-pick ae8f2dd +git cherry-pick bf266a7 #mv specvars.tex specvars-orig.tex -- cgit v1.2.3 From d54bb60e6490d78981424e9b65a9bf84bdb9b5bf Mon Sep 17 00:00:00 2001 From: mstsirkin Date: Tue, 23 Dec 2014 19:27:08 +0000 Subject: makediff: cherry-pick some changes to avoid markup Signed-off-by: Michael S. Tsirkin git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@462 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652 --- makediff.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'makediff.sh') 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 -- cgit v1.2.3 From 0ebeb90b133d201bc3354c5fe525ddc9559bd5bb Mon Sep 17 00:00:00 2001 From: mstsirkin Date: Tue, 23 Dec 2014 19:27:44 +0000 Subject: makediff: cherry-pick title changes Signed-off-by: Michael S. Tsirkin git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@464 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 692c90d..3fc70be 100755 --- a/makediff.sh +++ b/makediff.sh @@ -31,6 +31,7 @@ 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 EOF #mv specvars.tex specvars-orig.tex -- cgit v1.2.3 From 220bd6d578b0842912997febb8841cc05995814e Mon Sep 17 00:00:00 2001 From: mstsirkin Date: Tue, 23 Dec 2014 20:31:55 +0000 Subject: makediff: cherry-pick more changelog commits We really should automate this going forward. For now - cherry-pick manually. Signed-off-by: Michael S. Tsirkin git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@468 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 3fc70be..98b7caa 100755 --- a/makediff.sh +++ b/makediff.sh @@ -32,6 +32,7 @@ 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 EOF #mv specvars.tex specvars-orig.tex -- cgit v1.2.3 From c40d15e5dbb13e90ecb08d323ef2ad8b02b4de2c Mon Sep 17 00:00:00 2001 From: mstsirkin Date: Tue, 23 Dec 2014 20:40:34 +0000 Subject: makediff: cherry-pick more changelog changes Signed-off-by: Michael S. Tsirkin git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/branches/v1.0@470 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 98b7caa..16eba2d 100755 --- a/makediff.sh +++ b/makediff.sh @@ -33,6 +33,7 @@ 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 -- cgit v1.2.3