Date: Wed, 21 Nov 2012 03:44:22 -0500 (EST) From: Frank Seltzer <frank_s@bellsouth.net> To: "Sergey V. Dyatko" <sergey.dyatko@gmail.com> Cc: freebsd-stable@freebsd.org Subject: Re: Node conflicts in SVN Message-ID: <alpine.BSF.2.00.1211210322330.1612@Ace.nina.org> In-Reply-To: <20121120092708.501e3f3a@laptop> References: <alpine.BSF.2.00.1211191121340.1612@Ace.nina.org> <CAN6yY1uvrOELCtYG%2BaeBa8QZHPPjjtx4wVO8iOiHX87SSDErQA@mail.gmail.com> <alpine.BSF.2.00.1211191425390.1612@Ace.nina.org> <20121120092708.501e3f3a@laptop>
next in thread | previous in thread | raw e-mail | index | archive | help
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 Mk/bsd.cran.mk
D Mk/bsd.database.mk
D Mk/bsd.destdir.mk
D Mk/bsd.drupal.mk
D Mk/bsd.efl.mk
etc. I can forward this file to you if you would like to take a look at
it.
Following that with 'grep -A1 C\ stat' shows 217 lines similar to these:
D C accessibility
> local unversioned, incoming add upon update
--
D C arabic
> local unversioned, incoming add upon update
--
D C archivers
> local unversioned, incoming add upon update
--
D C astro
> local unversioned, incoming add upon update
--
D C audio
> local unversioned, incoming add upon update
It's up to 27 now (see below). Again, this is on 3 separate boxes, none
running csup, cvsup or anything else but 'svn co'.
Updating '.':
Skipped 'MOVED' -- Node remains in conflict
Skipped 'irc' -- Node remains in conflict
Skipped 'net-p2p' -- Node remains in conflict
Skipped 'games' -- Node remains in conflict
Skipped 'sysutils' -- Node remains in conflict
Skipped 'textproc' -- Node remains in conflict
Skipped 'net' -- Node remains in conflict
Skipped 'japanese' -- Node remains in conflict
Skipped 'databases' -- Node remains in conflict
Skipped 'graphics' -- Node remains in conflict
Skipped 'security' -- Node remains in conflict
Skipped 'x11-fm' -- Node remains in conflict
Skipped 'dns' -- Node remains in conflict
Skipped 'www' -- Node remains in conflict
Skipped 'archivers' -- Node remains in conflict
Skipped 'astro' -- Node remains in conflict
Skipped 'math' -- Node remains in conflict
Skipped 'devel' -- Node remains in conflict
Skipped 'audio' -- Node remains in conflict
Skipped 'Mk' -- Node remains in conflict
Skipped 'deskutils' -- Node remains in conflict
Skipped 'mail' -- Node remains in conflict
Skipped 'net-mgmt' -- Node remains in conflict
Skipped 'net-im' -- Node remains in conflict
Skipped 'multimedia' -- Node remains in conflict
Skipped 'finance' -- Node remains in conflict
Skipped 'ftp' -- Node remains in conflict
At revision 307611.
Summary of conflicts:
Skipped paths: 27
Frank
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.1211210322330.1612>