diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-01-08 20:48:25 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2020-01-08 20:48:25 +0000 |
| commit | 43ecef265d4377667516cf095d6d1c71f2bd6302 (patch) | |
| tree | 128ab5dc4deac3b988c4b0d5bdfea54030906e11 | |
| parent | 9d82823197096aa8b68e51e2a79225e570496012 (diff) | |
| -rwxr-xr-x | svn-git-mirror.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/svn-git-mirror.sh b/svn-git-mirror.sh index 3df6946..2ad79a5 100755 --- a/svn-git-mirror.sh +++ b/svn-git-mirror.sh @@ -57,13 +57,6 @@ while true; do # Wait for git pushes from previous iteration wait || true - if [ -d "$workdir/svnrepo" ]; then - prevrev=$(svn info "file://$workdir/svnrepo" \ - | grep "^Revision: " | sed -e "s/^Revision: //" || true) - fi - if ! [ "$prevrev" -gt "1" ]; then - prevrev=0 - fi while true; do rsync -az --del "$svnrsync/" "$workdir/svnrepo/" & res=0 && wait $! || res=$? @@ -75,7 +68,6 @@ while true; do newrev=$(svn info "file://$workdir/svnrepo" \ | grep "^Revision: " | sed -e "s/^Revision: //") $top/svn-list-branches.sh --branchfile "$workdir/@branchfile.new" \ - --prevrev "$prevrev" \ --reparent "$reparent" \ --svntop "file://$workdir/svnrepo" \ --verbose="$verbose" @@ -100,6 +92,10 @@ while true; do svnurl_opt="--svnurl $svnurl" fi rm -f $workdir/$version/STATUS + if [ -d $workdir/$version/@git ]; then + rm -rf $workdir/$version/@git.bak + mv $workdir/$version/@git $workdir/$version/@git.bak + fi ( $top/svn-git-repo.sh --branchfile "$workdir/@branchfile" \ --force \ |