From owner-svn-soc-all@FreeBSD.ORG Tue Jul 8 21:49:02 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2AF19ACB for ; Tue, 8 Jul 2014 21:49:02 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1818324FA for ; Tue, 8 Jul 2014 21:49:02 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s68Ln1tD029310 for ; Tue, 8 Jul 2014 21:49:01 GMT (envelope-from op@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s68Ln1Yk029296 for svn-soc-all@FreeBSD.org; Tue, 8 Jul 2014 21:49:01 GMT (envelope-from op@FreeBSD.org) Date: Tue, 8 Jul 2014 21:49:01 GMT Message-Id: <201407082149.s68Ln1Yk029296@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to op@FreeBSD.org using -f From: op@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r270615 - soc2014/op/tools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jul 2014 21:49:02 -0000 Author: op Date: Tue Jul 8 21:49:01 2014 New Revision: 270615 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=270615 Log: updated svn-update-freebsd-base.csh Signed-off-by: Oliver Pinter Modified: soc2014/op/tools/svn-update-freebsd-base.csh Modified: soc2014/op/tools/svn-update-freebsd-base.csh ============================================================================== --- soc2014/op/tools/svn-update-freebsd-base.csh Tue Jul 8 21:48:37 2014 (r270614) +++ soc2014/op/tools/svn-update-freebsd-base.csh Tue Jul 8 21:49:01 2014 (r270615) @@ -1,3 +1,5 @@ #!/bin/csh +svnlite up + svnlite merge ^/mirror/FreeBSD/head