projects
/
invirt/scripts/git-migration.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deal with package_branches.
[invirt/scripts/git-migration.git]
/
git-migrate-fast.sh
diff --git
a/git-migrate-fast.sh
b/git-migrate-fast.sh
index
55cee03
..
66be321
100755
(executable)
--- a/
git-migrate-fast.sh
+++ b/
git-migrate-fast.sh
@@
-3,8
+3,9
@@
set -e
# Depends: python-yaml, python-mako
# and svn-all-fast-export, which comes from git://repo.or.cz/svn-all-fast-export
# Depends: python-yaml, python-mako
# and svn-all-fast-export, which comes from git://repo.or.cz/svn-all-fast-export
+# (except you actually want git://andersk.mit.edu/svn-all-fast-export localtime)
# and builds with `qmake && make` with
# and builds with `qmake && make` with
-# Build-Depends: qt4-qmake, libqt4-dev, libsvn-dev
+# Build-Depends: libqt4-dev, libsvn-dev
# Usage: ./git-migrate-fast.sh [svn-uri]
# Exports into new subdir ./git .
# Usage: ./git-migrate-fast.sh [svn-uri]
# Exports into new subdir ./git .
@@
-22,25
+23,23
@@
done
svn-all-fast-export --identity-map ../authors ../rules "$SVN"
svn-all-fast-export --identity-map ../authors ../rules "$SVN"
-sed -n 's/^create repository // p' ../rules | while read repo; do
- if [ -e "$repo/refs/heads/tags" ]; then
- cp -a "$repo/refs/heads/tags/." "$repo/refs/tags"
- rm -rf "$repo/refs/heads/tags"
- fi
-done
-
pushd packages/invirt-dev.git
pushd packages/invirt-dev.git
-git tag sipb-xen-dev/13 sipb-xen-dev/14~2
+GIT_COMMITTER_NAME='Eric Price' GIT_COMMITTER_EMAIL='ecprice@mit.edu' GIT_COMMITTER_DATE='1206829393 -0400' \
+ git tag -a sipb-xen-dev/13 sipb-xen-dev/14~2 -F - <<EOF
+Tag 13 of sipb-xen-dev
+
+svn path=/package_tags/sipb-xen-dev/13/; revision=316
+EOF
popd
pushd packages/invirt-remote.git
popd
pushd packages/invirt-remote.git
-echo $(git rev-parse 0.2.0 invirt-remote-server invirt-remote-host) >> info/grafts
+echo $(git rev-parse 0.2.0^0 invirt-remote-server invirt-remote-host) >> info/grafts
git filter-branch --tag-name-filter cat -- ^invirt-remote-server ^invirt-remote-host --all
rm -rf info/grafts refs/original refs/heads/invirt-remote-server refs/heads/invirt-remote-host
popd
pushd packages/invirt-console.git
git filter-branch --tag-name-filter cat -- ^invirt-remote-server ^invirt-remote-host --all
rm -rf info/grafts refs/original refs/heads/invirt-remote-server refs/heads/invirt-remote-host
popd
pushd packages/invirt-console.git
-echo $(git rev-parse 0.2.0 0.2.0^ invirt-console-host) >> info/grafts
+echo $(git rev-parse 0.2.0^0 0.2.0^ invirt-console-host) >> info/grafts
git filter-branch --tag-name-filter cat -- ^0.2.0^ ^invirt-console-host --all
rm -rf info/grafts refs/original refs/heads/invirt-console-host
popd
git filter-branch --tag-name-filter cat -- ^0.2.0^ ^invirt-console-host --all
rm -rf info/grafts refs/original refs/heads/invirt-console-host
popd
@@
-52,8
+51,8
@@
rm -rf info/grafts refs/original refs/heads/dns
popd
pushd packages/invirt-database.git
popd
pushd packages/invirt-database.git
-echo $(git rev-parse invirt-database-server/0.0.1 0.0.1^) >> info/grafts
-echo $(git rev-parse 0.2.0 0.2.0^ invirt-database-server) >> info/grafts
+echo $(git rev-parse invirt-database-server/0.0.1^0 0.0.1^) >> info/grafts
+echo $(git rev-parse 0.2.0^0 0.2.0^ invirt-database-server) >> info/grafts
git filter-branch --tag-name-filter cat -- ^0.2.0^ --all
rm -rf info/grafts refs/original refs/heads/invirt-database-server
popd
git filter-branch --tag-name-filter cat -- ^0.2.0^ --all
rm -rf info/grafts refs/original refs/heads/invirt-database-server
popd