Lines Matching refs:changes
18 # Merge local changes that were made since the previous import:
20 # ./FREEBSD-upgrade merge-changes
40 # changes, then extract blows away the work tree and re-creates it with the
56 work="${src}/../${workname}" # merge-changes expects ${workname} in "..".
57 changes="${src}/FREEBSD-changes"
89 merge-changes) # Merge local changes that were made since the previous import.
96 diff -ru -X ${src}/FREEBSD-Xlist ${workname} jemalloc > ${changes} || true
100 patch -p1 < ${changes}
118 rm -rf ${work} ${changes}