Date: Mon, 19 Nov 2012 10:47:09 -0800 From: Kevin Oberman <kob6558@gmail.com> To: Frank Seltzer <frank_s@bellsouth.net> Cc: freebsd-stable@freebsd.org Subject: Re: Node conflicts in SVN Message-ID: <CAN6yY1uvrOELCtYG%2BaeBa8QZHPPjjtx4wVO8iOiHX87SSDErQA@mail.gmail.com> In-Reply-To: <alpine.BSF.2.00.1211191121340.1612@Ace.nina.org> References: <alpine.BSF.2.00.1211191121340.1612@Ace.nina.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Nov 19, 2012 at 8:28 AM, Frank Seltzer <frank_s@bellsouth.net> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAN6yY1uvrOELCtYG%2BaeBa8QZHPPjjtx4wVO8iOiHX87SSDErQA>