took p. and his mom to watch "over the hedge" today. he really liked it. it was very well animated and it wasn't a bad story but .. yeah .. nothing spectacular. but it was more important for the p-man to enjoy the outing, really.
we stopped in at a little import store that brings in fair trade goods and ended up chatting to the owner about some of the buddhist related pieces they have, ranging from mala beads and gongs to various statuettes of the buddha (some blessed by lamas with items sealed inside them) to buddhism-inspired ink paintings. i'm not buddhist myself, but i find much of the teachings of the various buddhist sects to be very interesting.
at one point the owner stood up and went behind the counter and pulled out a small pouch. in it were a few dozen seeds and some tiny dark pellets. he said that they had been blessed by the dalai lama on his 70th birthday; apparently a monk who had passed through calgary gave them to the store owner to give to people "when appropriate". the little pellets are meant to be dissolved under the tongue when bad things happen (like losing a loved one in death) to restore personal balance and bring one closer to the buddha and the dalai lama. he figured it was "an appropriate time". i now have one of the blessed orange seeds and three of the little pellets in a small bag. neat. =)
i've created a kdelibs branch for kconfig work and in my need to keep it sync'd with trunk/ i discovered svnmerge.py. wow! what a nice tool. it keeps a branch in sync with the mainline it was branched from quite painlessly. you just run `svnmerge.py init` once in the branch, then do a commit with `svn ci -F svnmerge-commit-message.txt` (yep, it generates commit messages even =) then periodically run `svnmerge.py merge` (followed by a commit usually). it keeps track of where it last merged up to by modifying the svn properties of the branch directory so it isn't dependant on a single local checkout, works fine if you start using it after modifying (and even committing those modifications to) the branch and takes care of annoyances like ensuring added files in the mainline and whatnot are handled properly. i'm sure it's not perfect and it doesn't do much to help merge the branch back into mainline (besides keeping them in sync prior to that) but it sure has made my life a bit easier =)
om mani padme hum.
Subscribe to:
Post Comments (Atom)
3 comments:
Too bad I didn't discover that for managing the three branches of koffice, would have make our life easier :)
Actually, it can do the merge the other way too. You just need to do:
svn co repos/trunk
cd trunk
svnmerge.py init repos/branches/branchX
And voila, you have merge tracking from branchX to trunk.
ad the ur blog about the seeds n im in calgary and i went into that same store,i think because the owner gave me a reddish 2 orange seed and 2 brown pellets,ive been very sick and he told me about it ...i want to take the brown one but i only have one because i gave one of mine to a friend,n now i have one left.i wonder if i should treasure it or try to become closer to oneself..lol!! i just hhad surgery n im a little lost lamb.if i do at least il know its part of me now,kinda corny,but way cool
Post a Comment