From owner-cvs-src@FreeBSD.ORG  Fri Dec 21 19:34:26 2007
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A79E516A468;
	Fri, 21 Dec 2007 19:34:26 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B43413C468;
	Fri, 21 Dec 2007 19:34:26 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBLJYQoR083293;
	Fri, 21 Dec 2007 19:34:26 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from dougb@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBLJYQHd083292;
	Fri, 21 Dec 2007 19:34:26 GMT (envelope-from dougb)
Message-Id: <200712211934.lBLJYQHd083292@repoman.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 21 Dec 2007 19:34:26 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Dec 2007 19:34:26 -0000

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