Andy Kopciuch's Blog
Wednesday, August 22, 2007
svnmerge, here-doc & Fruit Source
I have another mid-finished draft, and I've been so busy and lazy that I never finished it, and now I have a problem where I'm not really thinking about what I started anymore. Oh Well. Vacations are over, and everyone is back again for the most part. It was calm for a while, but I've gotten so much done in the last couple of days. Yesterday I did 9 different tasks for 9
different people yesterday before noon. It was craziness. From SPAM tweaking, to conference calls, account setups, renewing domains, coding, you name it ... I did it.
Over the past while I have started working with Kevin more on the programming side on L&Y things. We ventured forth into the land of svn branching and merging. On the suggestion of Aaron, I looked into svnmerge.py. Kevin and I both started using it on separate branches. It seemed simple enough in concept. NO LOCAL MODIFICATIONS! I have to remember that. Branching was no problem. Syncing with trunk was no problem for me, Kevin needed to upgrade his version of svnmerge.py, but worked it out. merging back into trunk was another story. It didn't work out so well for me. I'm not giving up on it ... it was only a first experience, and somehow the merge back only brought in some of my commits. Maybe it was a shortcoming of the merging, or maybe I bollocksed it up. I ended up doing a manual copy and commit to ensure things were right. We'll see what happens next branch.
Today I got back into my PDC installation. Samba + LDAP on feisty. I had this all working perfectly on breezy a year and a half ago, but things have changed. Not so much with Samba, but PHP5 is not required, as 4 is obsoleted. And the new version of PHPLDapAdmin is all OO, so I have a new curve to get into. I decided to make the apache2 configuration a little less obtrusive, and did some really bizarre and fancy bash scripting using here-doc syntax. Basically I open a config file at a specific line, and interact with vi through the here-doc to insert text at a specific point. I thought it was nifty. I tried for a few minutes to enter it in here ... but the syntax is so brutal, this editor just can not seem to handle it.
I'm all about living off of these sun riper "fruit source" bars. They are snack bars ... totally natural fruit / veggies. They taste awesome, and count for 2-3 fruit / veggie servings per bar. I still rock out with real fruit, but these dried fruit bars are so convenient, and easy. I'm all about them ... tasty. I think this is the first time I've been up until 2 AM in forever. Almost a month for sure. I'm beyond tired, and am heading to sleep right after this is done. ΒΆ 1:52:00 AM 0 comments
different people yesterday before noon. It was craziness. From SPAM tweaking, to conference calls, account setups, renewing domains, coding, you name it ... I did it.
Over the past while I have started working with Kevin more on the programming side on L&Y things. We ventured forth into the land of svn branching and merging. On the suggestion of Aaron, I looked into svnmerge.py. Kevin and I both started using it on separate branches. It seemed simple enough in concept. NO LOCAL MODIFICATIONS! I have to remember that. Branching was no problem. Syncing with trunk was no problem for me, Kevin needed to upgrade his version of svnmerge.py, but worked it out. merging back into trunk was another story. It didn't work out so well for me. I'm not giving up on it ... it was only a first experience, and somehow the merge back only brought in some of my commits. Maybe it was a shortcoming of the merging, or maybe I bollocksed it up. I ended up doing a manual copy and commit to ensure things were right. We'll see what happens next branch.
Today I got back into my PDC installation. Samba + LDAP on feisty. I had this all working perfectly on breezy a year and a half ago, but things have changed. Not so much with Samba, but PHP5 is not required, as 4 is obsoleted. And the new version of PHPLDapAdmin is all OO, so I have a new curve to get into. I decided to make the apache2 configuration a little less obtrusive, and did some really bizarre and fancy bash scripting using here-doc syntax. Basically I open a config file at a specific line, and interact with vi through the here-doc to insert text at a specific point. I thought it was nifty. I tried for a few minutes to enter it in here ... but the syntax is so brutal, this editor just can not seem to handle it.
I'm all about living off of these sun riper "fruit source" bars. They are snack bars ... totally natural fruit / veggies. They taste awesome, and count for 2-3 fruit / veggie servings per bar. I still rock out with real fruit, but these dried fruit bars are so convenient, and easy. I'm all about them ... tasty. I think this is the first time I've been up until 2 AM in forever. Almost a month for sure. I'm beyond tired, and am heading to sleep right after this is done. ΒΆ 1:52:00 AM 0 comments
