From owner-freebsd-hackers@FreeBSD.ORG Thu Dec 27 17:22:37 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 B43F8AF3; Thu, 27 Dec 2012 17:22:37 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-pb0-f43.google.com (mail-pb0-f43.google.com [209.85.160.43]) by mx1.freebsd.org (Postfix) with ESMTP id 76E948FC12; Thu, 27 Dec 2012 17:22:37 +0000 (UTC) Received: by mail-pb0-f43.google.com with SMTP id um15so5496168pbc.30 for ; Thu, 27 Dec 2012 09:22:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:references:mime-version:in-reply-to:content-type :content-transfer-encoding:message-id:cc:x-mailer:from:subject:date :to; bh=spVO4lUfAthIAFWrxf3laCf/YZIUsmlZcVOr1ICuP2k=; b=0ZA1G0LZIZpdbZNDsZiUZmpXMeByYlXGl6t9HZNc72gMTaHWlB7ol/d3njtxoJaAmB fAk+Uj5Y/cnVfql0pNX2C56d2HbMxRu8OtesOclU2j4o25ca/crIxlc6q//VfaFSjsAa y5kNhJokMhhCnGj0vpDQBvFAkb8j04QAHaF3m85Dg+7XZlx/6ZDY/ybaklvz13Zz0mps FQnb2eTbXdM8HAbMD02Ytq1lNGYRd/+eK6kLH+FHcIpgrYiuSeN0lWNcAtLVmAfWdqV7 3B3gISNzkzjelh6iF1AhcxFc+D06KN9BZEgkR/9JZdkfFmG1JH7mmGChrgjSPTVy589x IbQA== X-Received: by 10.68.239.99 with SMTP id vr3mr96454666pbc.154.1356628950967; Thu, 27 Dec 2012 09:22:30 -0800 (PST) Received: from [10.35.85.214] (mobile-166-147-094-097.mycingular.net. [166.147.94.97]) by mx.google.com with ESMTPS id nw9sm18109765pbb.42.2012.12.27.09.22.28 (version=SSLv3 cipher=OTHER); Thu, 27 Dec 2012 09:22:29 -0800 (PST) References: <50DC7958.70305@FreeBSD.org> Mime-Version: 1.0 (1.0) In-Reply-To: <50DC7958.70305@FreeBSD.org> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Message-Id: <74CCA452-07DD-4E17-9E0E-66EBAF9B0470@gmail.com> X-Mailer: iPhone Mail (10A523) From: Garrett Cooper Subject: Re: cvs deprecated Date: Thu, 27 Dec 2012 09:22:24 -0800 To: Sergey Matveychuk Cc: "Sam Fourman Jr." , Wojciech Puchar , "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 17:22:37 -0000 On Dec 27, 2012, at 8:37 AM, Sergey Matveychuk wrote: > 27.12.2012 20:29, Sam Fourman Jr. wrote: >> 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. >>=20 >> 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 >>=20 >> 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 >=20 > svn revert -R /usr/ports - works for me. If you're checking out to a directory that already exists, svn resolved is t= he way to handle that. There might be (-> probably is) a way to check out th= e metadata by itself, but I can't verify how right now. Hth, -Garrett=