fortressforever/git-svn-sync
0
0
Fork 0
mirror of https://github.com/fortressforever/git-svn-sync.git synced 2024-11-10 06:42:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update svn after each merge commit to avoid error

Browse source 
svn: E195020: Cannot merge into mixed-revision working copy [15152:15153]; try updating first
This commit is contained in:
Ryan Liptak 2018-02-01 22:33:12 -08:00
parent 9b7ac77151
commit 14fb258a66
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
github-svn-mirror.sh
View file

@ -66,6 +66,8 @@ while [ $revision_to_merge -le $git_head_revision ]; do
echo "Merging r$revision_to_merge ($commit_hash)"
svn merge --accept theirs-full --ignore-ancestry -c $revision_to_merge $git_location $svn_location || { report "Could not merge r$revision_to_merge ($commit_hash) from git repository to svn repository" ; exit 1; }
svn commit $svn_location -m "$commit_msg" || { report "Could not commit r$revision_to_merge ($commit_hash) to svn repository" ; exit 1; }
# update after commit to avoid svn: E195020: Cannot merge into mixed-revision working copy; try updating first
svn update $svn_location || report "Could not update svn after committing r$revision_to_merge ($commit_hash) to svn repository" ; exit 1; }
fi
let revision_to_merge=$revision_to_merge+1