diff options
| -rwxr-xr-x | Tools/scripts/mfh | 1 |
1 files changed, 1 insertions, 0 deletions
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} |