summaryrefslogtreecommitdiffstats
path: root/LOCKS
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2007-12-21 19:34:26 +0000
committerdougb <dougb@FreeBSD.org>2007-12-21 19:34:26 +0000
commita80b3812747a9837bcb27e9a7f5768abd978b072 (patch)
tree142cfe818cf6e8c3d96b204d4b39a9dd1bb83765 /LOCKS
parentca176184207c9b8a9cbb9cd35b05bba195bdaf45 (diff)
downloadFreeBSD-src-a80b3812747a9837bcb27e9a7f5768abd978b072.zip
FreeBSD-src-a80b3812747a9837bcb27e9a7f5768abd978b072.tar.gz
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 <cyrille.lefevre@laposte.net>
Diffstat (limited to 'LOCKS')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud