From owner-freebsd-stable@FreeBSD.ORG Mon Nov 19 23:26:09 2012 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 90633384 for ; Mon, 19 Nov 2012 23:26:09 +0000 (UTC) (envelope-from kob6558@gmail.com) Received: from mail-ea0-f182.google.com (mail-ea0-f182.google.com [209.85.215.182]) by mx1.freebsd.org (Postfix) with ESMTP id 1C8FB8FC13 for ; Mon, 19 Nov 2012 23:26:08 +0000 (UTC) Received: by mail-ea0-f182.google.com with SMTP id a14so813626eaa.13 for ; Mon, 19 Nov 2012 15:26:07 -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=Y6UnFq7ynibbk1UeWo0IPT/n41n0pjSIRACFgZAEPS4=; b=Za5Zz8zK9SC+qt4SuqQP8NGe7p2La/waX9vjMXO6nUsbQUmsZGIQ73RcXrd+F8vZHN Obgcqu/C0oqOYDhBm/Q0z0UIG812Re3T8tQiZgcyik7lPfRVlgLr0IJo1oAJWNqJvUcT C+h1i7vJbh05TlMEesOigaOmaIa2A7013aNsntMVaoc1RSr2/bSh6KHK+PoaaoxDG4qU LH0BHe94bBq6FxTqdHHUjnb1Ni2cyfJitLMSbBsHxhOCA6tD2a2SJygsOE9M0OTXZKzS u19MSjOQf+qDxYz8+Pb3O6VxGnxmE5HVTy4p3OViOYsoFDSkfY4zpECej8VNX4GjS6h/ /5IA== MIME-Version: 1.0 Received: by 10.14.194.71 with SMTP id l47mr28104548een.6.1353367567792; Mon, 19 Nov 2012 15:26:07 -0800 (PST) Received: by 10.223.71.199 with HTTP; Mon, 19 Nov 2012 15:26:07 -0800 (PST) In-Reply-To: References: Date: Mon, 19 Nov 2012 15:26:07 -0800 Message-ID: Subject: Re: Node conflicts in SVN From: Kevin Oberman To: Frank Seltzer Content-Type: text/plain; charset=UTF-8 Cc: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Nov 2012 23:26:09 -0000 On Mon, Nov 19, 2012 at 11:37 AM, Frank Seltzer wrote: > > > On Mon, 19 Nov 2012, Kevin Oberman wrote: > >> On Mon, Nov 19, 2012 at 8:28 AM, Frank Seltzer >> wrote: >>> >>> I run a nightly ports tree update and I have been getting the following >>> errors the last couple of days. I haven't seen this asked before so is >>> this >>> just me or is anyone else seeing this? Have I fat-fingered something? >>> >>> Updating '/usr/ports': >>> Skipped '/usr/ports/astro' -- Node remains in conflict >>> Skipped '/usr/ports/devel' -- Node remains in conflict >>> Skipped '/usr/ports/sysutils' -- Node remains in conflict >>> Skipped '/usr/ports/audio' -- Node remains in conflict >>> Skipped '/usr/ports/textproc' -- Node remains in conflict >>> Skipped '/usr/ports/x11-fm' -- Node remains in conflict >>> Skipped '/usr/ports/MOVED' -- Node remains in conflict >>> Skipped '/usr/ports/games' -- Node remains in conflict >>> Skipped '/usr/ports/mail' -- Node remains in conflict >>> Skipped '/usr/ports/net' -- Node remains in conflict >>> Skipped '/usr/ports/multimedia' -- Node remains in conflict >>> At revision 307524. >>> Summary of conflicts: >>> Skipped paths: 11 >> >> >> This usually indicates non-SVN updates to these items. If you have not >> modified them intentionally, just 'rm -r' them and 'snv up /usr/ports' >> again. I hit this after switch to svn when a cron job did a csup of >> ports. Oops! >> -- >> R. Kevin Oberman, Network Engineer >> E-mail: kob6558@gmail.com > > > Nope, no non-SVN updates or manual changes. I am getting this on 3 separate > boxes and have disabled csup in cron on them all. > > Are you sure about 'rm -r'ing them? IIRC, I reran 'svn co' instead of 'svn > up' by mistake on 1 box and it pulled the entire collection again. Not sure > about this as my memory ain't what it used to be. You know what they say, > The mind is the first thing to go! > > Thanks, > Frank In svn, "conflict" simply means that hte file on disk does not match the one in the SVN repository. This is usually because a file has been locally modified and svn won't blow away edits you have made in your sandbox. I mmean, htat is normally what a sandbox is for. Of course, if you are not a committer, this probably not the case, though you might have made local changes to a port, in which case you just were saved from foot-shooting. On any case, "rm -r /usr/ports/x11-fm /usr/ports/MOVED /usr/local/games /usr/local/mail /usr/local/net /usr/local/multimedia' is safe as an update will simply pull down new copies of those files from the repo. Or you can do them per-directory with 'svn up /usr/ports/MOVED', etc. -- R. Kevin Oberman, Network Engineer E-mail: kob6558@gmail.com