update the tree before merge to avoid having a mixed revision tree before merging

2013-12-26 17:27:19 +00:00 · 2013-12-26 17:27:19 +00:00 · 61c47bcd00
commit 61c47bcd00
parent 441a246517
1 changed files with 1 additions and 0 deletions
--- a/Tools/scripts/mfh
+++ b/Tools/scripts/mfh
@ -77,6 +77,7 @@ svn log -r$rev svn://svn.freebsd.org/ports/head | sed '1,2d;$d' >> commit.txt
 for f in ${filelist}; do
 	svn up --parents ${branch}/${f}
 done
+svn up --quiet ${branch}
 svn merge -c r${rev} ^/head/ ${branch}
 svn up --quiet ${branch}
 svn diff ${branch}