From owner-freebsd-stable@FreeBSD.ORG  Sat Jan 12 02:20:59 2013
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 47C614B6
 for <freebsd-stable@freebsd.org>; Sat, 12 Jan 2013 02:20:59 +0000 (UTC)
 (envelope-from wblock@wonkity.com)
Received: from wonkity.com (wonkity.com [67.158.26.137])
 by mx1.freebsd.org (Postfix) with ESMTP id 07CC2F0A
 for <freebsd-stable@freebsd.org>; Sat, 12 Jan 2013 02:20:58 +0000 (UTC)
Received: from wonkity.com (localhost [127.0.0.1])
 by wonkity.com (8.14.6/8.14.6) with ESMTP id r0C2Kuet002616;
 Fri, 11 Jan 2013 19:20:56 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Received: from localhost (wblock@localhost)
 by wonkity.com (8.14.6/8.14.6/Submit) with ESMTP id r0C2Kuur002613;
 Fri, 11 Jan 2013 19:20:56 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Date: Fri, 11 Jan 2013 19:20:56 -0700 (MST)
From: Warren Block <wblock@wonkity.com>
To: "Brian W." <brian@brianwhalen.net>
Subject: Re: csup to svn for 8-stable
In-Reply-To: <CADV=szWMqSKurCnGS8kEqPAXnmyPcDyxW4FHQYc=qQ7C6Oz1Ag@mail.gmail.com>
Message-ID: <alpine.BSF.2.00.1301111919270.1098@wonkity.com>
References: <CADV=szVSKnD7kPSY19zfhYP_hJ02vm7C-d7NDcCq9FwH-BjD+g@mail.gmail.com>
 <20130111224828.GL2001@albert.catwhisker.org>
 <CADV=szWMqSKurCnGS8kEqPAXnmyPcDyxW4FHQYc=qQ7C6Oz1Ag@mail.gmail.com>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7
 (wonkity.com [127.0.0.1]); Fri, 11 Jan 2013 19:20:57 -0700 (MST)
Cc: "freebsd-stable@freebsd.org" <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 <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Jan 2013 02:20:59 -0000

On Fri, 11 Jan 2013, Brian W. wrote:

> When I tried the first time, it only grabbed a few folders, a second try
> got me a conflict message. I then just whacked /usr/src and did the svn co
> again, successfully.

An important difference is that if you modify a file in /usr/src, an svn 
update will not overwrite it but try to merge with new versions of the 
file from the repository.