For IGNORE_FILES delete the version in the TEMPROOT, not the base.

Submitted by: clemens fischer <ino-news@spotteswoode.dnsalias.org>
svn path=/head/; revision=186688
2009-01-02 00:02:14 +00:00 · 2009-01-02 00:02:14 +00:00 · a740208973 · 2020-12-20 02:59:44 +00:00
commit a740208973
parent bfe36bb462
1 changed files with 1 additions and 1 deletions
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@ -644,7 +644,7 @@ case "${RERUN}" in

  # Avoid comparing the following user specified files
  for file in ${IGNORE_FILES}; do
-    test -e ${file} && unlink ${file}
+    test -e ${TEMPROOT}/${file} && unlink ${TEMPROOT}/${file}
  done
  ;; # End of the "RERUN" test
 esac