diff options
| -rwxr-xr-x | scripts/mageia-reset-and-import.sh | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/scripts/mageia-reset-and-import.sh b/scripts/mageia-reset-and-import.sh index 4d7dbcc..b50e5f1 100755 --- a/scripts/mageia-reset-and-import.sh +++ b/scripts/mageia-reset-and-import.sh @@ -421,9 +421,14 @@ revmap=".git/svn/refs/remotes/trunk/.rev_map.$OLDSVNUUID" if [ -f "$revmap" ]; then parsesvnrevmap "$revmap" "mdv" "" $resetsha1 >>"$sql" fi -for revmap in $(find .git/svn/refs/remotes/{tags,branches} -name .rev_map.$OLDSVNUUID 2>/dev/null); do +for revmap in $(find .git/svn/refs/remotes/tags -name .rev_map.$OLDSVNUUID 2>/dev/null); do + # Note, still pass in the tag name in case the tag is really more of a branch... parsesvnrevmap "$revmap" "mdv" "$(echo $revmap | cut -d'/' -f6)" >>"$sql" done +for revmap in $(find .git/svn/refs/remotes -maxdepth 2 -not -iwholename ".git/svn/refs/remotes/trunk/.rev_map.*" -name .rev_map.$OLDSVNUUID 2>/dev/null); do + parsesvnrevmap "$revmap" "mdv" "$(echo $revmap | cut -d'/' -f5)" >>"$sql" +done + # Inject the squashed commits into the map for rev in $squashedrevs $morerevisions; do @@ -440,9 +445,13 @@ revmap=".git/svn/refs/remotes/trunk/.rev_map.$NEWSVNUUID" if [ -f "$revmap" ]; then parsesvnrevmap "$revmap" "mga" "" $fakesha1 >>"$sql" fi -for revmap in $(find .git/svn/refs/remotes/{tags,branches} -name .rev_map.$NEWSVNUUID 2>/dev/null); do +for revmap in $(find .git/svn/refs/remotes/tags -name .rev_map.$NEWSVNUUID 2>/dev/null); do + # Note, still pass in the tag name in case the tag is really more of a branch... parsesvnrevmap "$revmap" "mga" "$(echo $revmap | cut -d'/' -f6)" >>"$sql" done +for revmap in $(find .git/svn/refs/remotes -maxdepth 2 -not -iwholename ".git/svn/refs/remotes/trunk/.rev_map.*" -name .rev_map.$NEWSVNUUID 2>/dev/null); do + parsesvnrevmap "$revmap" "mga" "$(echo $revmap | cut -d'/' -f5)" >>"$sql" +done xz "$sql" |