See inline.. > -----Original Message----- > Subject: Re: Trouble updating Sources via subversion? > > On Thu, 4 Oct 2012 09:27-0400, Howard Leadmon wrote: > > > > > OK, I have over the past few years updated and tracked various source > > using cvsup, and with freebsd progressing to where it now uses subversion > it > > seemed time to move over. > > > > I seem to be running into a problem doing this, and I wanted to see if > > anyone had a cloo they could offer on how to resolve this, so that hopefully > > I can get my collections of FBSD boxes back where they need to be on > > updates. > > > > First off, let me say I have tried to different ways of grabbing the > > sources (after the announcement of ports dropping cvsup and moving to > svn), > > which do both seem to work. I have used the following: > > > > svn co svn://svn.FreeBSD.org/ports/head /usr/ports > > > > I have also tried: > > > > svn co https://svn0.us-east.FreeBSD.org/ports/head /usr/ports > > > > > > Both seem to retrieve the sources very happily, so I don't seem to have a > > problem in that aspect, where I run into issues is when I go to grab > > updates. As an example let's say I wait a couple hours, and then cd down > > to my /usr/ports directory, and run 'svn update', it will happy come back > > and tell me it's updating ., and then spit out something like this (yes the > > issues reported will vary): > > > > # svn up > > Updating '.': > > Skipped 'www' -- Node remains in conflict > > Skipped 'x11-wm' -- Node remains in conflict > > Skipped 'net' -- Node remains in conflict > > Skipped 'x11' -- Node remains in conflict > > At revision 305233. > > Summary of conflicts: > > Skipped paths: 4 > > # > > > > > > So then I waited about another hour, and I ran 'svn update' again, and now > I > > get: > > > > # svn up > > Updating '.': > > Skipped 'net' -- Node remains in conflict > > Skipped 'x11' -- Node remains in conflict > > Skipped 'www' -- Node remains in conflict > > Skipped 'x11-wm' -- Node remains in conflict > > Skipped 'dns' -- Node remains in conflict > > Skipped 'devel' -- Node remains in conflict > > Skipped 'sysutils' -- Node remains in conflict > > Skipped 'lang' -- Node remains in conflict > > Skipped 'polish' -- Node remains in conflict > > Skipped 'security' -- Node remains in conflict > > Skipped 'editors' -- Node remains in conflict > > Skipped 'net-p2p' -- Node remains in conflict > > Skipped 'games' -- Node remains in conflict > > Skipped 'Mk' -- Node remains in conflict > > Skipped 'java' -- Node remains in conflict > > Skipped 'palm' -- Node remains in conflict > > Skipped 'multimedia' -- Node remains in conflict > > At revision 305253. > > Summary of conflicts: > > Skipped paths: 17 > > # > > > > > > As you can see, the longer I wait, the more entries I get, till eventually > > every time I run update, it will pretty much bitch about every directory in > > the tree. Sure I can run the resolve command and try and clear some of it, > > but that has to be done by hand and one at a time, and with a batch of > > machines I could see that taking hours to resolve. > > > > I have never had a source tree where this just seems to happen > constantly, > > I have completely removed my /usr/ports, /usr/src, and /usr/doc and done > > fresh checkouts many times over, yet still the issue returns. > > > > I am all for using subversion to handle updates to the various sources, and > > was trying to see if we could even offer to mirror for the FreeBSD project, > > but at the moment I can't even seem to get a stable source tree in hand > > unless I completely delete all sources and check out free every time, which > > is a huge waste of time and bandwidth for sure. > > > > Can anyone offer any suggestions or ideas on how to resolve this issue?? > > Are you running some form of automated CVSup updating in parallel with > Subversion?
Nope, I am literally just going to (in this example) /usr/ports and typing 'svn update' > If not, you should attempt these two commands: > > cd /usr/ports > svn revert The svn revert command seems to want the names of the specific files: # svn revert svn: E205001: Try 'svn help' for more info svn: E205001: Not enough arguments provided OK, so then as a test I did an 'svn revert net' which was one of the conflicts, and it said it cleared it. Here is the part I really don't get, and I could see if I was actually updating something in the directories, but if I just let the server sit for a few hours, the issues will change. A little more lengthy, but here is one of my servers I was toying with the problem on over the course of a couple hours. (I will post all output below) First off, I went into the /usr/ports directory, and I did an 'rm -rf *' to remove ALL sources, then I also make sure I removed the .svn directory as well. In the end an ls -a in the directory showed that no files remained, I was working from an empty area. At that point did did a checkout as specified in my original message, and sure enough it repopulated my directory structure and said my checkout was good. I then for grinds did an immediate 'svn update' and as expected it came right back in a couple minutes and said everything was current, no errors. This all seemed swell so far, so then I go do something else for a couple hours, and I come back (as root of course) and go into my /usr/ports directory and run 'svn update', and who now I have 4 skipped paths, so again I walk off and come back an hour or two later, and I run 'svn update' again, and now this time I have 17 skipped paths. So when I post the output, you will see I told it to revert net, and it did, and seems to want to update that now, but even fixing the one path, now I have 20 skipped paths, so I now magically picked up more issues. This machine is mine personally, nobody but me is logged into it, much less other root users. I had not done any updates in between, just walked off and ignored the server for a few hours and then returned to the exact same shell prompt. Sure it seems doing a revert will fix the issue, but if I have to fix 20 or 30 paths every time I want to update something, that is going to make it a major pain in the arse, especially considering I have to do this with a bunch of different servers. Anyway here is my untouched output over a few hours, as you will see I did nothing other than updates and the one fix per your suggestion. # svn up Updating '.': Skipped 'www' -- Node remains in conflict Skipped 'x11-wm' -- Node remains in conflict Skipped 'net' -- Node remains in conflict Skipped 'x11' -- Node remains in conflict At revision 305233. Summary of conflicts: Skipped paths: 4 # # # svn up Updating '.': Skipped 'net' -- Node remains in conflict Skipped 'x11' -- Node remains in conflict Skipped 'www' -- Node remains in conflict Skipped 'x11-wm' -- Node remains in conflict Skipped 'dns' -- Node remains in conflict Skipped 'devel' -- Node remains in conflict Skipped 'sysutils' -- Node remains in conflict Skipped 'lang' -- Node remains in conflict Skipped 'polish' -- Node remains in conflict Skipped 'security' -- Node remains in conflict Skipped 'editors' -- Node remains in conflict Skipped 'net-p2p' -- Node remains in conflict Skipped 'games' -- Node remains in conflict Skipped 'Mk' -- Node remains in conflict Skipped 'java' -- Node remains in conflict Skipped 'palm' -- Node remains in conflict Skipped 'multimedia' -- Node remains in conflict At revision 305253. Summary of conflicts: Skipped paths: 17 # svn revert svn: E205001: Try 'svn help' for more info svn: E205001: Not enough arguments provided # pwd /usr/ports # svn revert net Reverted 'net' # svn update Updating '.': Skipped 'security' -- Node remains in conflict Skipped 'editors' -- Node remains in conflict Skipped 'net-p2p' -- Node remains in conflict Skipped 'games' -- Node remains in conflict Skipped 'Mk' -- Node remains in conflict Skipped 'java' -- Node remains in conflict C net/rwhoisd U net/rwhoisd/Makefile C net/libnatpmp U net/libnatpmp/distinfo U net/libnatpmp/Makefile C net/beanstalkd U net/beanstalkd/distinfo C net/gq U net/gq/Makefile C net/fsplib U net/fsplib/Makefile C net/ssvnc U net/ssvnc/Makefile C net/babeld U net/babeld/distinfo U net/babeld/Makefile Skipped 'palm' -- Node remains in conflict Skipped 'multimedia' -- Node remains in conflict Skipped 'x11-wm' -- Node remains in conflict Skipped 'x11' -- Node remains in conflict Skipped 'dns' -- Node remains in conflict Skipped 'www' -- Node remains in conflict Skipped 'sysutils' -- Node remains in conflict Skipped 'devel' -- Node remains in conflict Skipped 'lang' -- Node remains in conflict Skipped 'polish' -- Node remains in conflict Skipped 'audio' -- Node remains in conflict Skipped 'deskutils' -- Node remains in conflict Skipped 'misc' -- Node remains in conflict Skipped 'databases' -- Node remains in conflict Updated to revision 305258. Summary of conflicts: Tree conflicts: 7 Skipped paths: 20 # As you can see, nothing was done other than running update, yet it keeps increasing in conflicts without even touching the box. I am using svn for other functions, one good one for me is rancid, and it tracks all my routers/switches perfectly, I am not constantly cleaning up conflicts, granted not nearly as many files. So this really has me miffed, and why I am posting.. > The second command will revert all locally modified files back to > their current state as registrered in the repo. Actually the files are > restored from the /usr/ports/.svn directory. > > Try again to update your working copy, i.e.: > > svn up /usr/ports > > If you are still getting error messages as shown above, try this > drastic approach: > > If you have any local stuff in your /usr/ports hierarchy, you better > have copies of said stuff elsewhere. Next, delete everything inside of > /usr/ports, including the .svn directory. Retry the checkout operation > using the master server, or your favorite mirror, and your protocol of > choice, e.g.: See above, this is very much what I did, I made sure I was down to the bare metal, it was an empty dir, no files, no .files of any kind remaining, so when I did the checkout it only had what svn pulled. > svn co svn://svn.FreeBSD.org/ports/head /usr/ports > > Then, just for kicks, try to update /usr/ports: > > svn up /usr/ports > > If you're still getting error messages, make sure no one else is > logged in as root/toor. Again, mentioned above, nobody is on this machine other than me, as it runs some mail for me, logging, and is my IPv6 gateway back to my datacenter. Outside of some non-related functions like mail/gateway, nothing should be changed or touched by anyone in the sources. > Now, you can restore any local stuff in /usr/ports. > > HTH. > > -- > +-------------------------------+------------------------------------+ > | Vennlig hilsen, | Best regards, | > | Trond Endrestøl, | Trond Endrestøl, | > | IT-ansvarlig, | System administrator, | > | Fagskolen Innlandet, | Gjøvik Technical College, Norway, | > | tlf. mob. 952 62 567, | Cellular...: +47 952 62 567, | > | sentralbord 61 14 54 00. | Switchboard: +47 61 14 54 00. | > +-------------------------------+------------------------------------+ Again thanks for the input, I really thought I had covered most of the bases, and this just has me stumped! --- Howard Leadmon _______________________________________________ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "freebsd-questions-unsubscr...@freebsd.org"
