[blfs-dev] Higgs Syncronization
Hi all, Somehow, my installation of the BLFS book in my sandbox doesn't point at the new server. I do not even want to think how it happened as I have been cloning my sandbox (BLFS repo) for years every time I have a new build. My most recent updates are not being reflected in the SVN BOOK, but the commit messages are coming through fine. The commit #'s conflict with some of the other recent commits, so I'm asking everyone to not commit until I fix this. I am working on it right now, but until I fix it, it will be more and more difficult to fix as long as others make updates. This is weird. I emailed Bruce about it yesterday, but didn't think too much about it; however, there has been recent commits that I see on the higgs server that I cannot see when I do svn update. Please hold off on any more BLFS BOOK updates until I get this fixed. Thanks. -- Randy rmlscsi: [bogomips 1003.23] [GNU ld version 2.16.1] [gcc (GCC) 4.0.3] [GNU C Library stable release version 2.3.6] [Linux 2.6.14.3 i686] 20:44:00 up 49 days, 6:43, 1 user, load average: 0.02, 0.01, 0.00 -- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
Re: [blfs-dev] Higgs Syncronization
Randy McMurchy wrote: > Hi all, > > Somehow, my installation of the BLFS book in my sandbox doesn't point at > the new server. I do not even want to think how it happened as I have been > cloning my sandbox (BLFS repo) for years every time I have a new build. > > My most recent updates are not being reflected in the SVN BOOK, but the > commit messages are coming through fine. The commit #'s conflict with some > of the other recent commits, so I'm asking everyone to not commit until I > fix this. > > I am working on it right now, but until I fix it, it will be more and more > difficult to fix as long as others make updates. This is weird. I emailed > Bruce about it yesterday, but didn't think too much about it; however, there > has been recent commits that I see on the higgs server that I cannot see > when I do svn update. > > Please hold off on any more BLFS BOOK updates until I get this fixed. Thanks. I do a nightly update of BLFS on my personal system and the website does a nightly build from svn. Actually it's a little complicated. The script is on anduin and does an 'svn export' of the book there and then the rendered data is copied to linuxfromscratch.org (higgs). What do you see missing? My local revision is 10962. -- Bruce -- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
Re: [blfs-dev] Higgs Syncronization
On 1/23/2013 9:58 PM, Bruce Dubbs wrote: > Randy McMurchy wrote: >> Please hold off on any more BLFS BOOK updates until I get this fixed. Thanks. > > What do you see missing? My local revision is 10962. And that is exactly the problem. There are two repos active right now. This migration wasn't exactly smooth. :-) I noticed in the BLFS commit logs that Armin and I committed work and the commit revision numbers were the same (which should be impossible). But somehow, you and I continued to use the repo on Quantum while Armin must have done a fresh checkout and is using the repo on Higgs. Look: Here is from my old sandbox (which must be on Quantum): randy@rmlinux: ~/Books/BLFS/BOOK > svn status -u Status against revision: 10962 randy@rmlinux: ~/Books/BLFS/BOOK > svn up Updating '.': At revision 10962. Now here is from a fresh checkout (which must come from Higgs): randy@rmlinux: ~/Books/BLFS/BOOK2 > svn status -u Status against revision: 10964 randy@rmlinux: ~/Books/BLFS/BOOK2 > svn up Updating '.': At revision 10964. All I can think is I need to commit the changes that I had done to the repo on Quantum to the repo on Higgs and then delete my old repo that was on Quantum. That should get me synced with the changes that Armin has made. I suggest that you also do a fresh checkout, Bruce. -- Randy -- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
Re: [blfs-dev] Higgs Syncronization
On Thu, 24 Jan 2013 07:06:22 -0600, Randy McMurchy wrote: > randy@rmlinux: ~/Books/BLFS/BOOK > svn status -u > Status against revision: 10962 > randy@rmlinux: ~/Books/BLFS/BOOK > svn up What does 'svn info' show for your URL. I wonder if you've got 'svn+ssh://quantum.linuxfromscratch.org/' in there, and not 'svn+ssh://svn.linuxfromscratch.org/')? Ta, Matt. > Updating '.': > At revision 10962. > > > Now here is from a fresh checkout (which must come from Higgs): > > randy@rmlinux: ~/Books/BLFS/BOOK2 > svn status -u > Status against revision: 10964 > randy@rmlinux: ~/Books/BLFS/BOOK2 > svn up > Updating '.': > At revision 10964. > > All I can think is I need to commit the changes that I had done to the > repo on Quantum to the repo on Higgs and then delete my old repo that > was on Quantum. That should get me synced with the changes that Armin > has made. I suggest that you also do a fresh checkout, Bruce. > > -- > Randy > > -- > http://linuxfromscratch.org/mailman/listinfo/blfs-dev > FAQ: http://www.linuxfromscratch.org/blfs/faq.html > Unsubscribe: See the above information page -- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
Re: [blfs-dev] Higgs Syncronization
Le 24/01/2013 14:06, Randy McMurchy a écrit : > On 1/23/2013 9:58 PM, Bruce Dubbs wrote: >> Randy McMurchy wrote: >>> Please hold off on any more BLFS BOOK updates until I get this fixed. >>> Thanks. >> What do you see missing? My local revision is 10962. > And that is exactly the problem. There are two repos active right now. > This migration wasn't exactly smooth. :-) > > I noticed in the BLFS commit logs that Armin and I committed work and > the commit revision numbers were the same (which should be impossible). > But somehow, you and I continued to use the repo on Quantum while Armin > must have done a fresh checkout and is using the repo on Higgs. Look: > > Here is from my old sandbox (which must be on Quantum): > > randy@rmlinux: ~/Books/BLFS/BOOK> svn status -u > Status against revision: 10962 > randy@rmlinux: ~/Books/BLFS/BOOK> svn up > Updating '.': > At revision 10962. > > > Now here is from a fresh checkout (which must come from Higgs): > > randy@rmlinux: ~/Books/BLFS/BOOK2> svn status -u > Status against revision: 10964 > randy@rmlinux: ~/Books/BLFS/BOOK2> svn up > Updating '.': > At revision 10964. > > All I can think is I need to commit the changes that I had done to the > repo on Quantum to the repo on Higgs and then delete my old repo that > was on Quantum. That should get me synced with the changes that Armin > has made. I suggest that you also do a fresh checkout, Bruce. > For me, removing ~/.ssh/known_hosts was enough. But I lost all my ssh known hosts. I could not find the specific entry corresponding to svn.linuxfromscratch.org, so I deleted the whole file. OTH, svn.linuxfromscratch.org points to the same address as higgs' one, while linuxfromscratch.org points to quantum... pierre@b07-cluster: nslookup > higgs.linuxfromscratch.org Non-authoritative answer: Name: higgs.linuxfromscratch.org Address: 192.155.86.174 > quantum.linuxfromscratch.org Non-authoritative answer: Name: quantum.linuxfromscratch.org Address: 216.171.237.234 > svn.linuxfromscratch.org Non-authoritative answer: svn.linuxfromscratch.orgcanonical name = higgs.linuxfromscratch.org. Name: higgs.linuxfromscratch.org Address: 192.155.86.174 > linuxfromscratch.org Non-authoritative answer: Name: linuxfromscratch.org Address: 216.171.237.234 That could be a problem if your sandbox did not point to svn.linuxfromscratch.org (svn info gives that). Regards Pierre -- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
Re: [blfs-dev] Higgs Syncronization
Matthew Burgess wrote these words on 01/24/13 07:41 CST: > On Thu, 24 Jan 2013 07:06:22 -0600, Randy McMurchy > wrote: > >> randy@rmlinux: ~/Books/BLFS/BOOK > svn status -u >> Status against revision: 10962 >> randy@rmlinux: ~/Books/BLFS/BOOK > svn up > > What does 'svn info' show for your URL. I wonder if you've got > 'svn+ssh://quantum.linuxfromscratch.org/' in there, and not > 'svn+ssh://svn.linuxfromscratch.org/')? I had 'svn+ssh://linuxfromscratch.org/' which unfortunately points to the quantum server. I know what is going on now. I just want to get the two repos synced together. -- Randy rmlscsi: [bogomips 1003.23] [GNU ld version 2.16.1] [gcc (GCC) 4.0.3] [GNU C Library stable release version 2.3.6] [Linux 2.6.14.3 i686] 08:20:00 up 49 days, 18:19, 1 user, load average: 0.23, 0.09, 0.02 -- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
Re: [blfs-dev] Higgs Syncronization
On Thu, 24 Jan 2013 08:23:47 -0600, Randy McMurchy wrote: > Matthew Burgess wrote these words on 01/24/13 07:41 CST: >> On Thu, 24 Jan 2013 07:06:22 -0600, Randy McMurchy > wrote: >> >>> randy@rmlinux: ~/Books/BLFS/BOOK > svn status -u >>> Status against revision: 10962 >>> randy@rmlinux: ~/Books/BLFS/BOOK > svn up >> >> What does 'svn info' show for your URL. I wonder if you've got >> 'svn+ssh://quantum.linuxfromscratch.org/' in there, and not >> 'svn+ssh://svn.linuxfromscratch.org/')? > > I had 'svn+ssh://linuxfromscratch.org/' which unfortunately points to the > quantum server. I know what is going on now. I just want to get the two > repos > synced together. I'm still stuck at work for the time being, so can't do anything immediately. Hopefully, you're OK with re-committing your changes? I assume here that there have been more commits to the higgs repo than the quantum repo? If so, then I think you should be OK to do the following from within your working copy: svn switch svn+ssh://svn.linuxfromscratch.org (see http://svnbook.red-bean.com/en/1.6/svn.ref.svn.c.switch.html for the docs) >From that above link, I think your changes may well be persisted, so you >should be able to resolve any conflicts and just reapply. If not, you'll have to copy and paste the commit diff from your latest commit(s) into a patch file, apply to your working copy, and commit again. We should have (obviously) switched off the svn daemon on quantum as soon as (or just before) the DNS change had been applied; that would have prevented this from happening. Bruce, if you see this within the next couple of hours, would you mind doing so please? Thanks, Matt. -- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
Re: [blfs-dev] Higgs Syncronization
Randy McMurchy wrote these words on 01/24/13 08:23 CST: > I just want to get the two repos synced together. Done. I migrated all the changes I made to the repo on Quantum to the repo on Higgs. Sorry for the noise and trouble. It was confusing to me for a bit. -- Randy rmlscsi: [bogomips 1003.23] [GNU ld version 2.16.1] [gcc (GCC) 4.0.3] [GNU C Library stable release version 2.3.6] [Linux 2.6.14.3 i686] 09:01:00 up 49 days, 19:00, 1 user, load average: 0.25, 0.19, 0.08 -- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
