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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "[email protected]"

Reply via email to