dougb 2007-12-21 19:34:26 UTC FreeBSD src repository
Modified files: usr.sbin/mergemaster mergemaster.sh Log: In the following scenario: 1. Start mergemaster 2. Interrupt it 3. < Somehow the temproot directory disappears > 4. mergemaster -r Many bad things can happen, especially if the -i option is in use. Therefore, add a check to make sure it still exists before we start comparing files. Brought to my attention by: PR: bin/40538 Submitted by: Cyrille Lefevre <[EMAIL PROTECTED]> Revision Changes Path 1.55 +7 -0 src/usr.sbin/mergemaster/mergemaster.sh _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "[EMAIL PROTECTED]"