Date: Mon, 19 Nov 2012 23:12:33 -0500 (EST) From: Frank Seltzer <frank_s@bellsouth.net> To: Eitan Adler <lists@eitanadler.com> Cc: freebsd-stable@freebsd.org Subject: Re: Node conflicts in SVN Message-ID: <alpine.BSF.2.00.1211192310490.1612@Ace.nina.org> In-Reply-To: <CAF6rxgnNqDdxKZ9RA%2BQKqHKOjB8V5OCBYKPmmW6wgYoF5KUnvA@mail.gmail.com> References: <alpine.BSF.2.00.1211191121340.1612@Ace.nina.org> <CAN6yY1uvrOELCtYG%2BaeBa8QZHPPjjtx4wVO8iOiHX87SSDErQA@mail.gmail.com> <alpine.BSF.2.00.1211191425390.1612@Ace.nina.org> <CAN6yY1v2dh2TDod-h0-_ikBThMMeB74nVvt9=nUY34_p2UciGg@mail.gmail.com> <alpine.BSF.2.00.1211192106030.1612@Ace.nina.org> <CAF6rxgnNqDdxKZ9RA%2BQKqHKOjB8V5OCBYKPmmW6wgYoF5KUnvA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 19 Nov 2012, Eitan Adler wrote: >> It's now up to 24. >> >> Updating '/usr/ports': >> >> Skipped '/usr/ports/mail' -- Node remains in conflict >> Skipped '/usr/ports/net' -- Node remains in conflict >> Skipped '/usr/ports/multimedia' -- Node remains in conflict >> Skipped '/usr/ports/dns' -- Node remains in conflict >> Skipped '/usr/ports/www' -- Node remains in conflict >> >> Skipped '/usr/ports/astro' -- Node remains in conflict >> Skipped '/usr/ports/sysutils' -- Node remains in conflict >> Skipped '/usr/ports/devel' -- Node remains in conflict >> Skipped '/usr/ports/audio' -- Node remains in conflict >> Skipped '/usr/ports/textproc' -- Node remains in conflict >> Skipped '/usr/ports/japanese' -- Node remains in conflict >> Skipped '/usr/ports/graphics' -- Node remains in conflict >> Skipped '/usr/ports/security' -- Node remains in conflict >> >> Skipped '/usr/ports/x11-fm' -- Node remains in conflict >> Skipped '/usr/ports/MOVED' -- Node remains in conflict >> Skipped '/usr/ports/irc' -- Node remains in conflict >> Skipped '/usr/ports/math' -- Node remains in conflict >> >> Skipped '/usr/ports/games' -- Node remains in conflict >> Skipped '/usr/ports/archivers' -- Node remains in conflict >> Skipped '/usr/ports/deskutils' -- Node remains in conflict >> Skipped '/usr/ports/net-p2p' -- Node remains in conflict >> Skipped '/usr/ports/databases' -- Node remains in conflict >> Skipped '/usr/ports/net-mgmt' -- Node remains in conflict >> Skipped '/usr/ports/net-im' -- Node remains in conflict >> At revision 307575. >> Summary of conflicts: >> Skipped paths: 24 > > did you run svn checkout on a directory which wasn't controlled by svn > (with stuff in it?). If so you need to remove those directories and > run "svn up". No, svn created the directory. I moved /usr/ports out of the way and ran 'svn co'. > -- > Eitan Adler
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.1211192310490.1612>