Changeset 2356 for trunk/scripts


Ignore:
Timestamp:
Jun 13, 2009, 6:32:51 PM (16 years ago)
Author:
andersk
Message:

svn-all-fast-export can create annotated tags now.

Location:
trunk/scripts/git-migration
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/scripts/git-migration/git-migrate-fast.sh

    r2353 r2356  
    2323svn-all-fast-export --identity-map ../authors ../rules "$SVN"
    2424
    25 sed -n 's/^create repository // p' ../rules | while read repo; do
    26     if [ -e "$repo/refs/heads/tags" ]; then
    27         cp -a "$repo/refs/heads/tags/." "$repo/refs/tags"
    28         rm -rf "$repo/refs/heads/tags"
    29     fi
    30 done
     25pushd packages/invirt-dev.git
     26GIT_COMMITTER_NAME='Eric Price' GIT_COMMITTER_EMAIL='ecprice@mit.edu' GIT_COMMITTER_DATE='1206829393 -0400' \
     27    git tag -a sipb-xen-dev/13 sipb-xen-dev/14~2 -F - <<EOF
     28Tag 13 of sipb-xen-dev
    3129
    32 pushd packages/invirt-dev.git
    33 git tag sipb-xen-dev/13 sipb-xen-dev/14~2
     30svn path=/package_tags/sipb-xen-dev/13/; revision=316
     31EOF
    3432popd
    3533
    3634pushd packages/invirt-remote.git
    37 echo $(git rev-parse 0.2.0 invirt-remote-server invirt-remote-host) >> info/grafts
     35echo $(git rev-parse 0.2.0^0 invirt-remote-server invirt-remote-host) >> info/grafts
    3836git filter-branch --tag-name-filter cat -- ^invirt-remote-server ^invirt-remote-host --all
    3937rm -rf info/grafts refs/original refs/heads/invirt-remote-server refs/heads/invirt-remote-host
     
    4139
    4240pushd packages/invirt-console.git
    43 echo $(git rev-parse 0.2.0 0.2.0^ invirt-console-host) >> info/grafts
     41echo $(git rev-parse 0.2.0^0 0.2.0^ invirt-console-host) >> info/grafts
    4442git filter-branch --tag-name-filter cat -- ^0.2.0^ ^invirt-console-host --all
    4543rm -rf info/grafts refs/original refs/heads/invirt-console-host
     
    5351
    5452pushd packages/invirt-database.git
    55 echo $(git rev-parse invirt-database-server/0.0.1 0.0.1^) >> info/grafts
    56 echo $(git rev-parse 0.2.0 0.2.0^ invirt-database-server) >> info/grafts
     53echo $(git rev-parse invirt-database-server/0.0.1^0 0.0.1^) >> info/grafts
     54echo $(git rev-parse 0.2.0^0 0.2.0^ invirt-database-server) >> info/grafts
    5755git filter-branch --tag-name-filter cat -- ^0.2.0^ --all
    5856rm -rf info/grafts refs/original refs/heads/invirt-database-server
  • trunk/scripts/git-migration/rules.mako

    r2310 r2356  
    6767match /package_tags/${package}/([^/~]+)/${package}/
    6868  repository ${get_repo(package)}
    69   branch tags/${get_tag_prefix(package)}\1
     69  branch refs/tags/${get_tag_prefix(package)}\1
     70  annotated true
    7071  max revision ${packages[package]['undouble'][0] - 1}
    7172end match
     
    9596match /package_tags/${package}/([^/~]+)/
    9697  repository ${get_repo(package)}
    97   branch tags/${get_tag_prefix(package)}\1
     98  branch refs/tags/${get_tag_prefix(package)}\1
     99  annotated true
    98100%   if 'undouble' in packages[package]:
    99101  min revision ${packages[package]['undouble'][1]}
     
    103105match /package_tags/${package}/([^/~]+)~([^/~]+)/
    104106  repository ${get_repo(package)}
    105   branch tags/${get_tag_prefix(package)}\1_\2
     107  branch refs/tags/${get_tag_prefix(package)}\1_\2
     108  annotated true
    106109%   if 'undouble' in packages[package]:
    107110  min revision ${packages[package]['undouble'][1]}
     
    175178match /third_tags/${t}/([^/~]+)/
    176179  repository third/${t}.git
    177   branch tags/\1
     180  branch refs/tags/\1
     181  annotated true
    178182end match
    179183% endfor
Note: See TracChangeset for help on using the changeset viewer.