From owner-freebsd-hackers@FreeBSD.ORG Thu Dec 27 16:29:23 2012 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A9368927 for ; Thu, 27 Dec 2012 16:29:23 +0000 (UTC) (envelope-from sfourman@gmail.com) Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by mx1.freebsd.org (Postfix) with ESMTP id 3A6078FC08 for ; Thu, 27 Dec 2012 16:29:23 +0000 (UTC) Received: by mail-ea0-f177.google.com with SMTP id c10so3894013eaa.8 for ; Thu, 27 Dec 2012 08:29:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=9laoIJ6RduHaTzn1Ec/SWoGONJ5Cr84r+enqJpfALak=; b=WGT46A/zLIKAeSToL/Ogl1zZlr/OijC/XaXVdzXQ5UHGs4sU7i20S1JZ0VgpK4CJIP CYBWAh9lKTv02lMDYrP+i9m3Q9YCVVTtq7F2Uhwk9Zmhna4k/31oP05jXKey222dPLTP Mb4Ua92FOWmQ84htS5sMNWGFAdWkIp9HT35kDbf6Gc5/8fJU/eGW0Zv1h5JJLrsKE7YS LWxk91sqVS6i0SCjvxgyp+toovx60DyJ2xTcP4CPHTHl7OrXyLl9VYbZjQpQJZP7IhbN 6xTImHLszv+rgEGfgNyDu6UZcUyj0Z2IrqUksVduSAvOZVYaT/QF4sky0SbRZfijyLPq dLEw== MIME-Version: 1.0 Received: by 10.14.208.137 with SMTP id q9mr78546521eeo.28.1356625762125; Thu, 27 Dec 2012 08:29:22 -0800 (PST) Received: by 10.223.6.69 with HTTP; Thu, 27 Dec 2012 08:29:21 -0800 (PST) In-Reply-To: References: Date: Thu, 27 Dec 2012 11:29:21 -0500 Message-ID: Subject: Re: cvs deprecated From: "Sam Fourman Jr." To: Wojciech Puchar Content-Type: text/plain; charset=ISO-8859-1 Cc: freebsd-hackers@freebsd.org X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Dec 2012 16:29:23 -0000 On Thu, Dec 27, 2012 at 4:18 AM, Wojciech Puchar wrote: > but i can't find "moron guide" for using svn to update tree. I cant seem to find a way to handle conflicts, ive tried to do svn revert on every directory, but there is always more... maybe svn just isnt a good way to keep your ports tree current svn up Updating '.': Skipped 'databases' -- Node remains in conflict Skipped 'irc' -- Node remains in conflict Skipped 'lang' -- Node remains in conflict Skipped 'security/cyrus-sasl2' -- Node remains in conflict Skipped 'x11/keybinder' -- Node remains in conflict Skipped 'net-mgmt' -- Node remains in conflict At revision 309546. Summary of conflicts: Skipped paths: 6 -- Sam Fourman Jr.