From owner-freebsd-stable@FreeBSD.ORG Tue Nov 20 04:26:53 2012 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 60D06AED for ; Tue, 20 Nov 2012 04:26:53 +0000 (UTC) (envelope-from peter@rulingia.com) Received: from vps.rulingia.com (host-122-100-2-194.octopus.com.au [122.100.2.194]) by mx1.freebsd.org (Postfix) with ESMTP id DA7F48FC08 for ; Tue, 20 Nov 2012 04:26:51 +0000 (UTC) Received: from server.rulingia.com (c220-239-241-202.belrs5.nsw.optusnet.com.au [220.239.241.202]) by vps.rulingia.com (8.14.5/8.14.5) with ESMTP id qAK4Qm6P010621 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 20 Nov 2012 15:26:48 +1100 (EST) (envelope-from peter@rulingia.com) X-Bogosity: Ham, spamicity=0.000000 Received: from server.rulingia.com (localhost.rulingia.com [127.0.0.1]) by server.rulingia.com (8.14.5/8.14.5) with ESMTP id qAK4Qglb087381 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 20 Nov 2012 15:26:42 +1100 (EST) (envelope-from peter@server.rulingia.com) Received: (from peter@localhost) by server.rulingia.com (8.14.5/8.14.5/Submit) id qAK4QgJc087380; Tue, 20 Nov 2012 15:26:42 +1100 (EST) (envelope-from peter) Date: Tue, 20 Nov 2012 15:26:42 +1100 From: Peter Jeremy To: Frank Seltzer Subject: Re: Node conflicts in SVN Message-ID: <20121120042642.GK38823@server.rulingia.com> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="nhYGnrYv1PEJ5gA2" Content-Disposition: inline In-Reply-To: X-PGP-Key: http://www.rulingia.com/keys/peter.pgp User-Agent: Mutt/1.5.21 (2010-09-15) Cc: freebsd-stable@freebsd.org X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Nov 2012 04:26:53 -0000 --nhYGnrYv1PEJ5gA2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2012-Nov-19 23:12:33 -0500, Frank Seltzer wrote: >On Mon, 19 Nov 2012, Eitan Adler wrote: >> did you run svn checkout on a directory which wasn't controlled by svn >> (with stuff in it?). If so you need to remove those directories and >> run "svn up". > >No, svn created the directory. I moved /usr/ports out of the way and ran= =20 >'svn co'. Can you give the exact steps (including commands) you performed? --=20 Peter Jeremy --nhYGnrYv1PEJ5gA2 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlCrBoIACgkQ/opHv/APuIe38gCeNVXRs4cuooiaY+B8gYqIR8Xz Gd8An0TsutipZXCWD9Pk1/fXcAL4zSyk =+g34 -----END PGP SIGNATURE----- --nhYGnrYv1PEJ5gA2--