- main - earth.li

Re: [ALUG] svn tags, branches, etc
by Phil Ashby 06 Jul '11

06 Jul '11

Mark Rogers wrote: >> After an hour or so of reading tutorials and trawling Google I'm >> still stuck on something. I find the best place to start is the on line official book. Here's chapter 4 on branches (and merging): http://svnbook.red-bean.com/nightly/en/svn.branchmerge.using.html >> Suppose I want to call my current software tree "v1", and create a >> copy to become "v2". The software is a PHP web library and basically >> the purpose of v2 is to start removing all the old PHP3/PHP4 >> compatibility code, and tidy things up, thus breaking backwards >> compatibility. >> >> I think I start with something like: >> svn copy -m "v2" <svnrepo> <svnrepo>/tags/v1 >> svn copy -m "v2" <svnrepo> <svnrepo>/tags/v2 >> >> My current code is already in a directory ~/mylib/v1, and I want to >> keep that as it is (several apps on the server are using it), and >> checkout v2 directory ~/mylib/v2; new apps will start to use that >> version. AIUI, you should be able to create a branch for v2 development without affecting the v1 tree, just by doing this: svn copy -m 'making v2 branch' <repo>/mylib/v1 <repo>/mylib/v2 >> So far so good. Where I'm stuck is how to make sure that ~/mylib/v1 >> stays on the v1 branch so I can continue to fix bugs and add >> features (unlikely but possible) to it if I need to, and ~/mylib/v2 >> similarly stays on the v2 branch. Both will have regular commits to >> their respective branches, and I may want to merge fixes from v1 >> into v2 (and vice versa). In other words v1 will become v1.0.1, >> v1.0.2, ... and v2 will independently become v2.0.1, v2.0.2, ... >> whilst sharing common history and allowing me to migrate some >> changes between branches. According to the book, you can now check out your v2 branch to a separate working area: svn checkout <repo>/mylib/v2 ..where you can continue development of v2 separate from the v1 working area. These two work areas will initially be the same of course, however changes checked into v2 will not appear in v1 and vice versa. If you want to 'tag' specific releases of anything, you simply copy the relevant tree again, but give it a tag name eg: svn copy <repo>/mylib/v1 <repo>/mylib/v1.0.3 ..this is the same as creating a branch, thus the *humans* have to understand that this directory should not have changes committed (you can also use the paranoid access control mentioned in the book to prevent this happening). Merging is covered in the next page of the book (after branching): http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html ..where you will want to merge specific changes (that fix specific bugs) from one branch to the other. This works well as long as the humans don't commit bug fixes with other work, preventing the selection of changes by a changeset number (read the part on cherrypicking). HTH, Phil

1 0

svn tags, branches, etc
by Mark Rogers 05 Jul '11

05 Jul '11

After an hour or so of reading tutorials and trawling Google I'm still stuck on something. Suppose I want to call my current software tree "v1", and create a copy to become "v2". The software is a PHP web library and basically the purpose of v2 is to start removing all the old PHP3/PHP4 compatibility code, and tidy things up, thus breaking backwards compatibility. I think I start with something like: svn copy -m "v2" <svnrepo> <svnrepo>/tags/v1 svn copy -m "v2" <svnrepo> <svnrepo>/tags/v2 My current code is already in a directory ~/mylib/v1, and I want to keep that as it is (several apps on the server are using it), and checkout v2 directory ~/mylib/v2; new apps will start to use that version. So far so good. Where I'm stuck is how to make sure that ~/mylib/v1 stays on the v1 branch so I can continue to fix bugs and add features (unlikely but possible) to it if I need to, and ~/mylib/v2 similarly stays on the v2 branch. Both will have regular commits to their respective branches, and I may want to merge fixes from v1 into v2 (and vice versa). In other words v1 will become v1.0.1, v1.0.2, ... and v2 will independently become v2.0.1, v2.0.2, ... whilst sharing common history and allowing me to migrate some changes between branches. I think all I need to do is make sure in each directory I switch to the right branch and then any commits/copys will apply to that branch only, but everything I've read talks in terms of the branch being temporary while a new feature is added, rather than permanent with the intention of maintaining v1 and v2 as separate versions going forward (and no doubt spawning v3 from v2 at some point down the line). Before I go too far I just want to be sure I'm on the right track. -- Mark Rogers // More Solutions Ltd (Peterborough Office) // 0844 251 1450 Registered in England (0456 0902) @ 13 Clarke Rd, Milton Keynes, MK1 1LG

3 5

Unwanted "600" perms from Acroread
by ted.harding＠wlandres.net 04 Jul '11

04 Jul '11

Greetings! Maybe someone has an answer to this! If I open a PDF file in Acrobat Reader (ths file initially having '644' permissions), and then "print to file" (so that I have a PostScript version of it), the permissions of the PS file generated by Acrobat Reader are '600'. This is not a particular problem when I am working in the same directory as the file is in. However, when that machine is NFS-mounted to the machine that does my printing, and I 'lpr' the PS file from the printing machine, then the '600' prevents printing (I get error message "empty file"). This is because the '600' does not allow outsiders to access the file. All is well if I manually change the PS file permissions in the original directory to '644', since this now allows access. So my question: Is there a way to get Acrobat Reader to store the PS file it outputs with '644' permissions instead of '600'? I've had a bit of a look at the Acrobat Reader menus, without seeing anything helpful. With thanks, Ted. -------------------------------------------------------------------- E-Mail: (Ted Harding) <ted.harding(a)wlandres.net> Fax-to-email: +44 (0)870 094 0861 Date: 02-Jul-11 Time: 22:17:31 ------------------------------ XFMail ------------------------------

3 3

How to diagnose an intermittent web access 'hang'?
by Chris G 02 Jul '11

02 Jul '11

I have a strange problem when I try and access my home LAN web server from home. Once in every three or four connections the web server hangs for several minutes before the data is delivered. This happens when I access the pages as http://zbmc.eu/xxx/yyy. I was going to say that the data is eventually delivered but one I just tried returned a "The connection has timed out" message. If I access the same pages as http://localhost/xxx/yyy then it all works perfectly, no hangs. Now the 'fly in the ointment' as it were is that my ADSL connection uses two ADSL providers on two telephone lines, the sharing is provided by my Draytek Vigor 2820n router. I *suspect* that its the sharing in the router that causes the problem, but it doesn't happen for other URLs, just for http://zbmc.eu/ URLs. Any suggestions for how to diagnose what's going on? -- Chris Green

5 7

Imaging Windows dynamic disks using Linux
by Mark Rogers 02 Jul '11

02 Jul '11

I have a guy on site trying to replace a hard disk in a server (W2003); simple job: shut the server down and image it to a new disk, boot from new disk, walk away. Except it turns out not to be a single disk, it's two disks using Windows dynamic RAID which I know nothing about, but his imaging software doesn't handle it (Acronis). Anyone have any experience of imaging these disks using any of the various Linux options? Ideally I'm looking for something that'll be a small download as he only has limited Internet, and it would be even better if he can boot it from a USB thumb drive as he doesn't have a blank CD with him, although he can probably scrounge one from someone if he has to. -- Mark Rogers // More Solutions Ltd (Peterborough Office) // 0844 251 1450 Registered in England (0456 0902) @ 13 Clarke Rd, Milton Keynes, MK1 1LG

3 7

2600 meeting
by Ben Bewick 01 Jul '11

01 Jul '11

Hello Aluggers, A few people from alug have expressed and interest in the 2600 meetings, Stevepdp and I are attempting to relaunch the Norwich group. The meeting will take place today (Friday 1st July) at 6pm at the old Borders entrance to Chapelfield Mall, under the Big-Screen TV. Just to be verbose, we are not trying to poach alug members, we are by example attending both meets. There is alot of crossover of interests, we hope that both communities can benefit from each other. For those who are interested and can attend, see you there. If you are interested but cannot attend, maybe next month? For more information you can see our specific group information at http://norwich2600.co.uk or you can get a more generalised view at http://2600.net Viper

2 1

Loosing IP address
by James Bensley 01 Jul '11

01 Jul '11

I expect this is totally obvious and I'm being a complete buffoon but I can't work it out. Every time I disconnect my Ethernet cable on my laptop I loose my IP address (dropping to none configured) [Ubuntu 10.10]. I am constantly unplugging my cable and plugging it in different switch ports configuring switches all day, and I have to keep a terminal window open in the background so I can quickly switch to it, hit "up" and "enter" to re-run "sudo ifconfig eth0 1.2.3.4". I takes 5 seconds but man its annoying. Anyone got any idea? -- James. http://www.jamesbensley.co.cc/

3 3

1 July 2011
by ted.harding＠wlandres.net 01 Jul '11

01 Jul '11

Greetings All! Today is the 1st of July. I am wondering if the following is 3 months late: http://tinyurl.com/6hmmame Best wishes to all, Ted. -------------------------------------------------------------------- E-Mail: (Ted Harding) <ted.harding(a)wlandres.net> Fax-to-email: +44 (0)870 094 0861 Date: 01-Jul-11 Time: 10:50:38 ------------------------------ XFMail ------------------------------

1 0

Motherboard software RAID vs Linux FakeRAID
by Mark Rogers 01 Jul '11

01 Jul '11

I have an HP server with on-board RAID, ie it takes two drives and presents them to the O/S as a single drive, but the management of that drive utilises the main CPU not a RAID controller. If I use it, how would I be able to detect the RAID status? Or should I just use software RAID and mdtools? lspci reports: 00:11.0 RAID bus controller: ATI Technologies Inc SB7x0/SB8x0/SB9x0 SATA Controller [Non-RAID5 mode] (rev 40) If I decided to move to software RAID, what are my chances of migrating the existing install to RAID without re-installing? -- Mark Rogers // More Solutions Ltd (Peterborough Office) // 0844 251 1450 Registered in England (0456 0902) @ 13 Clarke Rd, Milton Keynes, MK1 1LG

3 6

Minimal GUI for server (kiosk?)
by Mark Rogers 30 Jun '11

30 Jun '11

I have a server which will be running a web server and the primary means for accessing it will be via a web browser. I need to also provide a screen and keyboard/mouse for local use. Basically that means providing a mechanism for running a web browser. I don't *have* to limit the GUI to only running the browser, but it seems like that wouldn't be a bad idea (in which case the browser needs to stay running, ie be restarted if it dies for any reason). Chromium crossed my mind but as I understand it that's not really ready yet. My base OS install is Ubuntu Server, so ideally I'm looking for something that would be an apt-get install away from Ubuntu Server rather than a different OS or distro. Suggestions? -- Mark Rogers // More Solutions Ltd (Peterborough Office) // 0844 251 1450 Registered in England (0456 0902) @ 13 Clarke Rd, Milton Keynes, MK1 1LG

4 4