Node conflicts in SVN

2012-11-19 Thread Frank Seltzer
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 confl

Re: Node conflicts in SVN

2012-11-19 Thread Kevin Oberman
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

Re: Node conflicts in SVN

2012-11-19 Thread Frank Seltzer
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

Re: Node conflicts in SVN

2012-11-19 Thread Kevin Oberman
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

Re: Node conflicts in SVN

2012-11-19 Thread Frank Seltzer
On Mon, 19 Nov 2012, Kevin Oberman wrote: 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 coup

Re: Node conflicts in SVN

2012-11-19 Thread Eitan Adler
On 19 November 2012 21:43, Frank Seltzer wrote: > > > On Mon, 19 Nov 2012, Kevin Oberman wrote: > >> 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: > >

Re: Node conflicts in SVN

2012-11-19 Thread Frank Seltzer
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

Re: Node conflicts in SVN

2012-11-19 Thread Peter Jeremy
On 2012-Nov-19 23:12:33 -0500, Frank Seltzer wrote: >On Mon, 19 Nov 2012, Eitan Adler wrote: >> 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

Re: Node conflicts in SVN

2012-11-19 Thread Sergey V. Dyatko
On Mon, 19 Nov 2012 14:37:00 -0500 (EST) 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 ha

Re: Node conflicts in SVN

2012-11-21 Thread Frank Seltzer
On Tue, 20 Nov 2012, Sergey V. Dyatko wrote: Can you run `svn status`? What does it show ? -- wbr, tiger 'svn status > stat' creates a 5.5 meg file mostly consisting of lines like: D Mk/bsd.apache.mk D Mk/bsd.autotools.mk D Mk/bsd.cmake.mk D Mk/bsd.commands.mk D

Re: Node conflicts in SVN

2012-11-21 Thread Ronald Klop
On Wed, 21 Nov 2012 09:44:22 +0100, Frank Seltzer wrote: On Tue, 20 Nov 2012, Sergey V. Dyatko wrote: Can you run `svn status`? What does it show ? -- wbr, tiger 'svn status > stat' creates a 5.5 meg file mostly consisting of lines like: D Mk/bsd.apache.mk D Mk/bsd.auto

Re: Node conflicts in SVN

2012-11-21 Thread Tom Evans
On Wed, Nov 21, 2012 at 8:44 AM, Frank Seltzer wrote: > Following that with 'grep -A1 C\ stat' shows 217 lines similar to these: > > D C accessibility > > local unversioned, incoming add upon update This says that svn has an entry for a file/directory named 'accessibility', but that a

RE: Node conflicts in SVN [SEC=UNCLASSIFIED]

2012-11-19 Thread Robinson, Greg
...@freebsd.org] On Behalf Of Frank Seltzer Sent: Tuesday, 20 November 2012 6:07 AM To: Kevin Oberman Cc: freebsd-stable@freebsd.org Subject: Re: Node conflicts in SVN 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 tr

Re: Node conflicts in SVN [SEC=UNCLASSIFIED]

2012-11-19 Thread Ronald Klop
Tuesday, 20 November 2012 6:07 AM To: Kevin Oberman Cc: freebsd-stable@freebsd.org Subject: Re: Node conflicts in SVN 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 error