From owner-freebsd-questions@FreeBSD.ORG  Tue Jan  6 21:42:29 2009
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 88FDA106566C
	for <freebsd-questions@freebsd.org>;
	Tue,  6 Jan 2009 21:42:29 +0000 (UTC)
	(envelope-from jhass88@gmail.com)
Received: from ag-out-0708.google.com (ag-out-0708.google.com [72.14.246.243])
	by mx1.freebsd.org (Postfix) with ESMTP id 3C1BB8FC0C
	for <freebsd-questions@freebsd.org>;
	Tue,  6 Jan 2009 21:42:29 +0000 (UTC)
	(envelope-from jhass88@gmail.com)
Received: by ag-out-0708.google.com with SMTP id 23so5852533agd.3
	for <freebsd-questions@freebsd.org>;
	Tue, 06 Jan 2009 13:42:28 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:message-id:date:from:to
	:subject:mime-version:content-type:content-transfer-encoding
	:content-disposition;
	bh=pt7NQVtEDxnvBnR4sRFw9qUItlZi0kSts936ZqYiPDA=;
	b=jGh8lzITNRTwb+4eX7tO21436R2W8Emk2x21z9wWBeg1PX8Z0mboe4GYa++slrMa4r
	I6+F9S2S+cH1fzk1I27lpXbjXL2CljUA21YQ+SuFLws8kwRB5nJpiepjFMbpzrjn2bmo
	+SxXF9Q8DJE892DzTk3p50PGuIbmDNWi0lpQA=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=message-id:date:from:to:subject:mime-version:content-type
	:content-transfer-encoding:content-disposition;
	b=VSUMIyV9V9SBacGb6q2WvOyITe5kPpFwHfsGg0fmqxIYzKZD4Oxt3lyJ82DdKWhQEA
	RflpxlVcMGhmg8yMIUuAx8mLNFdBOGgKWlpeUHPQ7ceRhhx+FPvP2GP3wQ+yV9bEmpXb
	xdNg7e4nw1EEEI2p7VCM3Y3zsr8ZqtiPZxlEc=
Received: by 10.214.114.8 with SMTP id m8mr18798166qac.294.1231277323839;
	Tue, 06 Jan 2009 13:28:43 -0800 (PST)
Received: by 10.214.149.9 with HTTP; Tue, 6 Jan 2009 13:28:43 -0800 (PST)
Message-ID: <ab52c4f40901061328i254481d9obb36bcf53757d7db@mail.gmail.com>
Date: Tue, 6 Jan 2009 16:28:43 -0500
From: "Johann Hasselbach" <jhass88@gmail.com>
To: freebsd-questions@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Subject: mergemaster goof when src upgrading 7.0 -> 7.1
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2009 21:42:29 -0000

I was doing a src upgrade from 7.0 to 7.1

After installkernel, i rebooted, and accidently ran "mergemaster"
instead of "mergemaster -p" before installworld. I ctrl-c'd once I
realized what I had done, but the damage was done.

It seems to have overwritten my password and group files.

I successfully copied groups, passwd, master.passwd, pwd.db, and
spwd.db from a recent backup and everything looks okay now.

Did I damage anything else?