Index: quilt/quilt/annotate.in =================================================================== --- quilt.orig/quilt/annotate.in +++ quilt/quilt/annotate.in @@ -171,11 +171,12 @@ trap "rm -f $template" EXIT # by line. empty_file ${files[0]} > $template -for ((n = 0; n < address@hidden; n++)) -do - annotation_for "${files[n]}" "${files[n+1]}" $((n+1)) -done \ -| patch $template +( for ((n = 0; n < address@hidden; n++)) + do + annotation_for "${files[n]}" "${files[n+1]}" $((n+1)) + done + echo w +) | ed -s $template merge_files $template "address@hidden" echo