diff options
| author | bapt <bapt@FreeBSD.org> | 2013-12-27 01:27:19 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2013-12-27 01:27:19 +0800 |
| commit | 5b0456fe0f026fe8dc39c5d827a0e4067bf9503d (patch) | |
| tree | 2e29b4fbb80fa5f315416bd214e8d932a43cfd0d /Tools | |
| parent | 77a29cd66f480785d591bcb574f7f1d97c939658 (diff) | |
| download | freebsd-ports-graphics-5b0456fe0f026fe8dc39c5d827a0e4067bf9503d.tar.gz freebsd-ports-graphics-5b0456fe0f026fe8dc39c5d827a0e4067bf9503d.tar.zst freebsd-ports-graphics-5b0456fe0f026fe8dc39c5d827a0e4067bf9503d.zip | |
update the tree before merge to avoid having a mixed revision tree before merging
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 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} |