Node conflicts in SVN

[Eitan Adler]

On 19 November 2012 21:43, Frank Seltzer <frank_s at bellsouth.net> wrote:
>
>
> On Mon, 19 Nov 2012, Kevin Oberman wrote:
>
>> On Mon, Nov 19, 2012 at 11:37 AM, Frank Seltzer <frank_s at bellsouth.net>
>> wrote:
>>>
>>>
>>>
>>> On Mon, 19 Nov 2012, Kevin Oberman wrote:
>>>
>>>> On Mon, Nov 19, 2012 at 8:28 AM, Frank Seltzer <frank_s at 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
>
>
> 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".


-- 
Eitan Adler