From owner-freebsd-questions@FreeBSD.ORG  Tue Nov  5 03:39:37 2013
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 16CB73B4
 for <freebsd-questions@freebsd.org>; Tue,  5 Nov 2013 03:39:37 +0000 (UTC)
 (envelope-from nikolas.britton@gmail.com)
Received: from mail-ie0-x229.google.com (mail-ie0-x229.google.com
 [IPv6:2607:f8b0:4001:c03::229])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DFA1327EF
 for <freebsd-questions@freebsd.org>; Tue,  5 Nov 2013 03:39:36 +0000 (UTC)
Received: by mail-ie0-f169.google.com with SMTP id ar20so14109450iec.14
 for <freebsd-questions@freebsd.org>; Mon, 04 Nov 2013 19:39:36 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:date:message-id:subject:from:to:content-type;
 bh=4c+LYDfD8DflayITyfN0XMZpQYQghO4k3FIHLEOGofs=;
 b=vyXTWyjmbm6zfbhumUjdqtHzY5mMxrdAMm8niztGa6s21FQlQj1KlnsGbsjY9I6Ji7
 4xkucMxuQf2VELcWbtS6kaD9rZBhlPbDvKVc9LHSmYlbQvfDyikE2GBjg/uhO45yfxUg
 rW04QuN3mGhjLNFVllEzC1sA/P9p3tOgqr0ebqa9ueaFU8j+hQmgyU2yfctqa0VBdHVx
 G5WJ8+9FzwwkFuv55UnsN7t3YQg5PjY+2o2zXqBMrWk+f8yDyb5vw9UF19ADsR4eX0Ll
 ZcW3KvoeZCKSfWH36qdYGRGoys+TrPyADU3BjSQqFaJEj0z4z8+bLBGjYNVpFAssy7NG
 +N9Q==
MIME-Version: 1.0
X-Received: by 10.50.67.46 with SMTP id k14mr14355399igt.16.1383622776166;
 Mon, 04 Nov 2013 19:39:36 -0800 (PST)
Received: by 10.43.75.6 with HTTP; Mon, 4 Nov 2013 19:39:36 -0800 (PST)
Date: Mon, 4 Nov 2013 21:39:36 -0600
Message-ID: <CAJq8UEV_6hjHhPBwOyrw683n6r9zbiFDzeqd6vL+WY-jMGBM7w@mail.gmail.com>
Subject: How to merge svn project branches with local /usr/src?
From: Nikolas Britton <nikolas.britton@gmail.com>
To: freebsd-questions@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1
X-Content-Filtered-By: Mailman/MimeDel 2.1.14
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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, 05 Nov 2013 03:39:37 -0000

Hi,

I'm confused with the mechanics of merging a svn project branches into
/usr/src. I would like to merge the vps code, here:
http://svnweb.freebsd.org/base/projects/vps/ onto my FreeBSD 10-STABLE test
system. I presume svn merges everything into /usr/src automatically with
the right command(s)?

I feel like this is a dumb question, but I'm not familiar with the new svn
at all. The last time I used FreeBSD we did these things with cvs and diff
patches.

Thank you.