Date: Fri, 21 Dec 2007 19:34:26 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <200712211934.lBLJYQHd083292@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <cyrille.lefevre@laposte.net>
Revision Changes Path
1.55 +7 -0 src/usr.sbin/mergemaster/mergemaster.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200712211934.lBLJYQHd083292>