- main - earth.li

Struggling to get my head around git
by Mark Rogers 20 Sep '10

20 Sep '10

I haven't quite got my head into the git mindset, and I've not really found a good overview which has "clicked". The situation I'm playing with is merging what are two seperate developments (branches?) of the same web application. One is a third party web application that progresses over time without my involvement, and the other is the version of the codebase which contains my own customisations. The application in this case is ZenCart (PHP based). Can someone guide me quickly through the points in the sequence below where I should brange, commit, merge, etc? 1. Install ZenCart-1.3.8a 2. Customise to create MyApp. (This customisation takes place over several months/years) 3. ZenCart 1.3.9f is released so I need to upgrade MyApp. 4. After merging, I have a 1.3.9f version of MyApp for testing. 5, Meanwhile, some development continues on the live 1.3.8a version of MyApp. 6. The 1.3.9f version of MySite passes testing, I now need to merge in the changes that took place in 5. 7. Test again, and if testing doesn't complete before more changes take place, go back to 5. 8. Testing complete, migrate to 1.3.9f version of my site as working copy. 9. Some time later, 1.3.10b is released and I want to upgrade again. 10. ... and so on.... I think where I am getting stuck is working out what should be the "master" branch and how to keep switching between branches as necessary. Indeed, I'm not even really sure how many branches I should have here? For anyone who saw my previous posts on this: I have successfully used git to achieve steps 1-4, which in itself is fantastic for me. However, I'm now in the situation that development on the live site has continued before the new version has been accepted, so now I have new changes to apply, and at the moment the only way I can work out to do it is to start from scratch which (a) I don't want to do as the merge was not straightforward, and (b) is clearly the wrong way to be doing it. When I started looking at it again, git status tells me that my test code is on branch "MyApp-1.3.8a", although it is the merged 1.3.9f version of the site code. Either I have done something wrong or I've chosen a bad name for the branch (it should probably just be "MyApp"?) but either way I'm in a muddle! -- Mark Rogers // More Solutions Ltd (Peterborough Office) // 0844 251 1450 Registered in England (0456 0902) @ 13 Clarke Rd, Milton Keynes, MK1 1LG

1 0

Flash part the second
by Bev Nicolson 19 Sep '10

19 Sep '10

It's that problem again. I now have Firefox 3.6.10 and flash still doesn't work but now it seems to be wobbling in Chrome too. I tried uninstalling it and installing again (using Synaptic) but now I suspect it must be broken. Anyone got any ideas? Bev.

1 0

[ALUG Announce] 3rd Monday Monthly Ipswich Social Meeting : McGintys, Northgate Street
by samwise 17 Sep '10

17 Sep '10

ALUG Announce Please send announcements to Announce(a)lists.alug.org.uk Unsub, change settings via http://lists.alug.org.uk/mailman/listinfo/announce ----- The monthly "Third Monday" ALUG Ipswich Social Meeting is back, Monday 20th September, at 20:00: P J McGinty & Sons 15 Northgate Street Ipswich Suffolk IP1 3BY Tel: 01473 251 515 Map/Directions URI: http://maps.google.co.uk/?q=IP1+3BY WWW: http://www.pjmcgintys.co.uk/ McGintys pub is in the centre of Ipswich. It's directly opposite the town's central library and has a reputation for good Irish beer. We're usually to be found in the lowest section of the bar, near the library entrance to the pub. All are welcome, novices and experienced users. Feel free to ask for further information on the Main ALUG mailing list. Hopefully, see some of you there! Peter. ----- Send discussion replies to main(a)lists.alug.org.uk (Reply-To set) Unsub, change settings via http://lists.alug.org.uk/mailman/listinfo/announce

1 0

How to find characters in character map - or otherwise?
by Chris G 15 Sep '10

15 Sep '10

I recently wanted to put a degree symbol (as in ˚ hopefully) into some text and it took me ages (as in several minutes) to find the character in the Character Map application. Is there any quick/clever/easy way to find a character like this? In the Character Map you get swamped by Chinese/Cyrillic/Arabic script characters which you *know* are not what you want. Is there a way to see just 'roman' text characters plus special symbols etc.? Or can anyone suggest another way to find this sort of thing more easily? -- Chris Green

3 2

Bash script error; too many arguments
by James Bensley 15 Sep '10

15 Sep '10

Why does; if [ "$1" -ge 128 -a -lt 192 ] Error out with 'too many arguments', where have I gone wrong here? Also I have in the mean time settled with; if [ "$1" -ge 128 ] && [ $1 -lt 192 ] Is either one of these preferred over the other? -- Regards, James. http://www.jamesbensley.co.cc/ There are 10 kinds of people in the world; Those who understand Vigesimal, and J others...?

3 3

Laptop pointing devices, only those horrible pads nowadays?
by Chris G 15 Sep '10

15 Sep '10

I'm considering a new laptop/netbook and, having a selection around belonging to other members of the family, I'm still convinced that the standard traackpad is a truly awful pointing device. Are there really *no* laptops/netbooks available with other pointing devices? I have a very nice little wireless keyboard that we use with one of our computers that has a trackball in the keyboard and that works beautifully, can't manufacturers put one in a laptop? I guess I'll have to buy a laptop and add a trackbll of some sort but even then there seem very few which are aimed at the portable market. This isn't *just* a rant, any pointers to useful devices would be very welcome. (Linux friendly of course) -- Chris Green

9 12

Monitoring network traffic
by Mark Rogers 15 Sep '10

15 Sep '10

Our office LAN is getting painfully slow. It's likely that something is hogging the bandwidth. If I were to put a network hub between the ADSL router and the main office switch, presumably I could run something on a PC also connected to that switch which would point me in the direction of the problem? I'm looking for something fairly simple, that would tell me (eg) which IP address was generating most of the traffic, and perhaps on which ports. Wireshark would probably do what I need but it's not (from what I remember) particularly simple to get simple results from. Or, is there a better option? -- Mark Rogers // More Solutions Ltd (Peterborough Office) // 0844 251 1450 Registered in England (0456 0902) @ 13 Clarke Rd, Milton Keynes, MK1 1LG

4 5

ftp server recommendation?
by Peter Alcibiades 10 Sep '10

10 Sep '10

Quick question - we have just bought an all in one printer that does scan to ftp. What is the smallest and lightest ftp server I could install on one of our desktops for it to scan to? Its behind a router of course, so (maybe wrongly) I'm not expecting security to be a worry. But maybe this is too hopeful? Thanks for the feedback on proxy servers by the way. Its was not for anything that needs to withstand official investigation, just for privacy from the prying. Peter

4 4

git merge tools over SSH
by Mark Rogers 09 Sep '10

09 Sep '10

I'm slowly getting my head around git. I am trying it out on a large project, which is on a server (in my office) to which I have only SSH access, or access to the files via Samba. I ran a merge (which took quite while) and now need handle the conflicts. Looking for a decent tool to assist with the merge, I find that most are GUI based, and that suits me fine (and will help me get others in the office to buy-in to using it). However, if I access the files over the samba share and run "git status" it takes a while (10 mins?), presumably because my local git is having to deal with a lot of traffic over the network. Is there a better way to use a local merge tool on a remote repo? -- Mark Rogers // More Solutions Ltd (Peterborough Office) // 0844 251 1450 Registered in England (0456 0902) @ 13 Clarke Rd, Milton Keynes, MK1 1LG

5 7

anonymous proxy servers
by Peter Alcibiades 08 Sep '10

08 Sep '10

What does anyone use and or reccommend for an anonymous proxy server? I have come on anonymizer.com and also anonymouse.com. Are these decent? Are there any others to think about? Any that are better? Peter

3 2