mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

[master] don't sync api file changes

Browse Source 
(cherry picked from commit f2cb70f5d758495195ee53e593e75721bbbc80f0)
This commit is contained in:
Evan Hunt
2013-03-26 18:48:35 -07:00
parent 36279f1ce1
commit f0823fc624
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
util/branchsync.sh
View File

@@ -102,8 +102,8 @@ git log $SOURCEBRANCH --reverse --format='%H' $LASTHASH..$SOURCEBRANCH | \
while read hash author; do
if git cherry-pick -xn ${hash}; then
# cherry-pick was clean
# restore the copyrights file
git checkout HEAD -- util/copyrights
# restore the copyrights and api files
git checkout HEAD -- util/copyrights lib/*/api
# note which hash we've merged
savehash branchsync.dat $SOURCEBRANCH $hash
@@ -114,7 +114,7 @@ git log $SOURCEBRANCH --reverse --format='%H' $LASTHASH..$SOURCEBRANCH | \
continue
elif [ -n "$interactive" ]; then
# interactive mode -- wait for user to fix things
git checkout HEAD -- util/copyrights
git checkout HEAD -- util/copyrights lib/*/api
# note which hash we've merged
savehash branchsync.dat $SOURCEBRANCH $hash
else