Node conflicts in SVN

[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 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

Thanks,
Frank
_______________________________________________
freebsd...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "freebsd-stabl...@freebsd.org"

[Kevin Oberman]

On Mon, Nov 19, 2012 at 8:28 AM, Frank Seltzer <fra...@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

This usually indicates non-SVN updates to these items. If you have not
modified them intentionally, just 'rm -r' them and 'snv up /usr/ports'
again. I hit this after switch to svn when a cron job did a csup of
ports. Oops!
--
R. Kevin Oberman, Network Engineer
E-mail: kob...@gmail.com

[Frank Seltzer]

Nope, no non-SVN updates or manual changes. I am getting this on 3
separate boxes and have disabled csup in cron on them all.

Are you sure about 'rm -r'ing them? IIRC, I reran 'svn co' instead of
'svn up' by mistake on 1 box and it pulled the entire collection again.
Not sure about this as my memory ain't what it used to be. You know what
they say, The mind is the first thing to go!

Thanks,
Frank

[Kevin Oberman]

In svn, "conflict" simply means that hte file on disk does not match
the one in the SVN repository. This is usually because a file has been
locally modified and svn won't blow away edits you have made in your
sandbox. I mmean, htat is normally what a sandbox is for. Of course,
if you are not a committer, this probably not the case, though you
might have made local changes to a port, in which case you just were
saved from foot-shooting.

On any case, "rm -r /usr/ports/x11-fm /usr/ports/MOVED
/usr/local/games /usr/local/mail /usr/local/net /usr/local/multimedia'
is safe as an update will simply pull down new copies of those files
from the repo. Or you can do them per-directory with 'svn up
/usr/ports/MOVED', etc.

--
R. Kevin Oberman, Network Engineer
E-mail: kob...@gmail.com

[Frank Seltzer]

On Mon, 19 Nov 2012, Kevin Oberman wrote:

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

Frank

[Eitan Adler]

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

[Frank Seltzer]

No, svn created the directory. I moved /usr/ports out of the way and ran
'svn co'.

[Peter Jeremy]

On 2012-Nov-19 23:12:33 -0500, Frank Seltzer <fra...@bellsouth.net> 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 /usr/ports out of the way and ran
>'svn co'.

Can you give the exact steps (including commands) you performed?

--
Peter Jeremy

[Sergey V. Dyatko]

Can you run `svn status`? What does it show ?

> Are you sure about 'rm -r'ing them? IIRC, I reran 'svn co' instead
> of 'svn up' by mistake on 1 box and it pulled the entire collection
> again. Not sure about this as my memory ain't what it used to be.
> You know what they say, The mind is the first thing to go!
>
> Thanks,
> Frank

--
wbr, tiger

[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 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

[Ronald Klop]

On Wed, 21 Nov 2012 09:44:22 +0100, Frank Seltzer <fra...@bellsouth.net>
wrote:

http://svnbook.red-bean.com/en/1.2/svn.ref.svn.c.status.html
'D' Item is scheduled for Deletion.

Your files are marked deleted at your host. And it complains that it gets
an update from the server for a file which is deleted locally. Something
f*cked up your ports tree.
The solution for you is to remove /usr/ports and do a new checkout.

Ronald.

[Tom Evans]

On Wed, Nov 21, 2012 at 8:44 AM, Frank Seltzer <fra...@bellsouth.net> 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 file/directory named 'accessibility'
already exists on disk, and did not come from a svn checkout - ie,
'accessibility' is in /usr/ports/.svn/entries, but there is no
/usr/ports/accessibility/.svn .
When you do an 'svn up' now, there is a conflict - an unversioned
resource is in the way of checking out a versioned resource, and the
unversioned one should be deleted, so this is why it says "D" and "C".

Something has trashed your ports tree, re-check it out.

You were pretty adamant that you didn't check out ports over an
existing tree, which would explain this, I wonder what else it could
be. Do you (or did you) run portsnap? I wonder if that could trash a
working copy like this.

Cheers

Tom