From 5b0456fe0f026fe8dc39c5d827a0e4067bf9503d Mon Sep 17 00:00:00 2001 From: bapt Date: Thu, 26 Dec 2013 17:27:19 +0000 Subject: update the tree before merge to avoid having a mixed revision tree before merging --- Tools/scripts/mfh | 1 + 1 file changed, 1 insertion(+) (limited to 'Tools') diff --git a/Tools/scripts/mfh b/Tools/scripts/mfh index dd587e7cda1..fbdf5fca4fa 100755 --- 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} -- cgit