mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-21 00:25:50 +00:00
update the tree before merge to avoid having a mixed revision tree before merging
This commit is contained in:
parent
441a246517
commit
61c47bcd00
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=337564
@ -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}
|
||||
|
Loading…
Reference in New Issue
Block a user