diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-08-19 23:57:40 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-08-19 23:57:40 +0100 |
| commit | b2585bb5519c6091e65a145f01841f4aed62596c (patch) | |
| tree | 11e662c4b719699e4a63404a2e33671feb7f69b5 | |
| parent | 236f71f6eaf1fc9c0c4171074b261e9958443e68 (diff) | |
| download | svn-git-migration-b2585bb5519c6091e65a145f01841f4aed62596c.tar svn-git-migration-b2585bb5519c6091e65a145f01841f4aed62596c.tar.gz svn-git-migration-b2585bb5519c6091e65a145f01841f4aed62596c.tar.bz2 svn-git-migration-b2585bb5519c6091e65a145f01841f4aed62596c.tar.xz svn-git-migration-b2585bb5519c6091e65a145f01841f4aed62596c.zip | |
Make the author-map work without relative paths.
| -rwxr-xr-x | scripts/mageia-reset-and-import.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/scripts/mageia-reset-and-import.sh b/scripts/mageia-reset-and-import.sh index 5351ae1..50d2a91 100755 --- a/scripts/mageia-reset-and-import.sh +++ b/scripts/mageia-reset-and-import.sh @@ -14,7 +14,13 @@ if [ -z "$SOFTWARE" ]; then fi if [ -d ../$SOFTWARE.git ]; then - echo "It seems the converted git repository already exists (../$SOFTWARE.git)" + echo "It seems the converted git repository already exists (../$SOFTWARE.git)" >&2 + exit 1 +fi + +AUTHORMAP=$(realpath $(dirname $(realpath $0))/../metadata/mageia-user-map.txt) +if [ ! -f "$AUTHORMAP" ]; then + echo "Cannot find author map." >&2 exit 1 fi @@ -313,7 +319,7 @@ fi echo "Continuing svn fetch" if [ -n "$morerevisions" ]; then for rev in $morerevisions; do - git svn fetch -A ../authors-transform.txt -r $(( $revision + 1 )):$(( $rev - 1 )) + git svn fetch -A $AUTHORMAP -r $(( $revision + 1 )):$(( $rev - 1 )) revision=$rev done fi @@ -322,12 +328,12 @@ fi # should really check for.... if [ -n "$skiprevisions" ]; then for rev in $skiprevisions; do - git svn fetch -A ../authors-transform.txt -r $(( $revision + 1 )):$(( $rev - 1 )) + git svn fetch -A $AUTHORMAP -r $(( $revision + 1 )):$(( $rev - 1 )) revision=$rev done fi -git svn fetch -A ../authors-transform.txt -r $(( $revision + 1 )):HEAD +git svn fetch -A $AUTHORMAP -r $(( $revision + 1 )):HEAD git reset --hard trunk echo echo "done" |