diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-12-26 17:27:19 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-12-26 17:27:19 +0000 |
| commit | 61c47bcd00c2c25a68c593d02e53ce384c157ec8 (patch) | |
| tree | 2e29b4fbb80fa5f315416bd214e8d932a43cfd0d /Tools | |
| parent | 441a246517ec65b6fadbf57d4b0c5d50ce51f0da (diff) | |
| download | ports-61c47bcd00c2c25a68c593d02e53ce384c157ec8.tar.gz ports-61c47bcd00c2c25a68c593d02e53ce384c157ec8.zip | |
Notes
Diffstat (limited to 'Tools')
| -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 dd587e7cda17..fbdf5fca4fa7 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} |