Any time, after a little to long on a branch, that I go to merge back to trunk, I seem to forget the magic steps involved in making this easy. For my own reference, tag the head of the branch and then:
svn log http://example.com/url/to/branch --stop-on-copy
… will get us the revision that the branch happened from. Let’s say it’s 27101.
svn diff -r27101:HEAD http://example.com/url/to/branch --summarize
… will let us know of all the files that have changed between that revision and the head of the branch.
Then you’re free to take a trunk check-out and do a merge with full knowledge of what’s......
Fàire! Giog san amharc! Mu dheireadh thall ach tha ceòl math inntinneach gu bhith aig a’ Mhòd. Uill, air an iomall co-dhiù. Agus co na b’fheàrr airson a Mod Fringe a chrathadh ach Oi Polloi agus Na Gathan. Cùmhachd, fuinn, faclan mi-mhodhail agus daoine àraid.Faic iad aig:Behind the Wall, An Eaglais Bhreac, Diluain 13h Dàmhair. 7.30f agus saor san...
Unlike last month’s quiet patch, this month there are 6 films to take in.
The Wackness is about a teenage drug dealer and his psychiatrist becoming friends and going over the edge. The relationship that grows between the two leads is well handled, seeming genuine for the most part, but the same cannot be said for the somewhat forced love story between the teenager and the psychiatrist’s daughter. The dialogue throughout is excruciating (it’s supposed to be the nineties, so we get all kinds of street lingo), but there are some true horrors uttered between these two. Ben Kingsley excels as the psychiatrist but away from that there’s just not all that much to see here. A fairly average film.
The lack of decent US horror movies continues with the amazingly lacklustre...
Yes, it’s quite late again, which is surprising given there are only three films. Let’s see how they get on.
First up is Get Smart, the story of a bumbling agent in a hand-wavingly explained government spy agency. Ostensibly a comedy, the director manages to fumble the fundamentals with the film suffering from poorly explained sequences, predictability, an over-reliance on slapstick and poor stereotypes. There are funny moments in there (such as the brief fighter jet segment) and the cast (the otherwise excellent Steve Carrell and Alan Arkin) do their best, but there’s simply not much here. A shame.
Shane Meadows has created some of the finest moments in recent British cinema, from Dead Man’s Shoes bleak and grimy revenge story to This Is England’s look at...
Bidh Féis Fhiolmaichean na Reul-iùil a' dol bho 3-5 an Dàmhair ann an Cladach a...
Tha e math dha-rìreabh nuair a bhios na daoine as siùbhlaiche ann an saoghal na Gàidhlig a’ nochdadh air Radio nan Gàidheal. An t-seachdain-sa, b’ e Aonghas Dubh a bha a’ bruidhinn air a’ phrògram Leugh an Leabhar, agus a thug dhuinn briathar ùr mar mhìneachadh air aon de na sgeulan san leabhar Dìomhanas le Fionnlagh MacLeòid. B’ e dràma an ùmantais a thug e air An Cluasan – “Theatre of the Absurd” agus e a’ moladh an sgeulachd mhìorbhaileach sin. “Struth-mothachaidh” air “stream of consciousness” mar a thathas a’ cantainn ri obair Samuel Beckett sa leithid.Tha uiread de dh’ fhaclan anns an leabhar aig Fionnlagh a tha air a dhol à cleachdadh fiù ‘s ann an Leòdhas far am buin iad. Bha e iomchaidh gun do chuir Aonghas briathran eile air ais nar...
Chaidh a h-uile duine dhan tràigh as t-samhradh. Abair gun do chòrd an turas rinn – gu h-àraidh an clann. Rinn Arbory agus Aoife an dealbh seo le ainmean rudan a gheibhear air an tràigh. A’ bheil sibh eòlach orra uile gu lèir? Everyone went to the beach this summer. We really enjoyed it - especially the kids. Arbory and Aoife made this picture with names of things that are found on the beach. Do you know all of them? Faoileag, Faoileagan = Seagull, Seagulls Cearban = Shark Crosgag = Starfish (gheibhear crisgein-craisgein, croise na tràghad agus reannag na mara cuideachd) Leumadair-mara = Dolphin (muc-bhiorach, cuideachd) Muc-mhara, Mucan-mhara = Whales Taigh-Solais = Lighthouse Giomach, Giomaich = Lobster, Lobsters Slige, Sligeachan = Shell, Shells Bucaid, Bucaidean...
Ciamar a bhreabas mi boireannachAn cuimhneachan coileantaFaigh bus gus a’ phort-adhairTeich air boireannach fo lighe cùbhraigheachd agus faigh dachaigh ùr anns a’ chiad shreathCuir farmad air draibhear fhaighneachail (“Tha sinn a’ dol a dh’Alba!”) am feadh 's tu a’ gabhail glug aidhair ùr cho luath ’s a ghabhas gach turas a bhios an doras a’ fosgladhCuir seachad ùine no dhà aig port-adhair Amsterdam a’ coimhead air na bùithteanGabh fadachd liosta màirnealach agus coimhead air na bùithtean a-rithistNa caill am bùth aodaich is cuimhneachan agus brògan maide is muilleannan-gaoithe is tuiliopan gu lèor annBreab le do chas ri bonn boireannaich air a còmhdach le aodach gann is duineachan a th’ innte is tu air an rathad chun an roinn aodaichThoir beachd air a’...
Bha aoighean à Alba againn o chionn ghoirid – Seumas Greumach agus Kirsteen Nic Dhomhnaill, dithist sheinneadair Gàidhlig. Bha iad san sgìre seo airson Mòd Naiseanta Aimearagaidh, agus fhuair iad fàilte agus furan aig Taigh Mhic an Ultaigh fad's an robh iad ann. We had guests from Scotland recently - James Graham and Kirsteen MacDonald, two Gaelic singers. They were in the area for the U.S. National Mòd, and they got a big welcome at the McNulty house as long as they were here. Leugh Kirsteen leabhar Gàidhlig do Lorien agus Aoife – abair gun robh iad toilichte. Bha iad mar a chuir i fo gheasan iad! Kirsteen read Gaelic books to Lorien and Aoife - they were really pleased. It was as if they were spellbound! Tha Kirsteen agus Seumas a’ fuireachd ann an Glaschu – tha...
Only 4 films this month:
First up is Frank Darabont’s take on Stephen King’s The Mist. Amongst filmed versions of King’s work, it ranks amongst the most subtle and controlled pieces. Rather than explicitly showing everything that happened (creatures coming from another dimension and covering the world in a deep fog) and giving us another brainless monster/horror piece, Darabont has focussed on the real heart of the story: the tension between believers and non-believers, through a fairly cunningly chosen bunch of set-pieces. Slowly, different fears and prejudices seep through a group trapped in a supermarket until they inevitably turn on one another. The way this is done is masterful, and the climax is pretty heartbreaking, cheapened only slightly by an unnecessary...
An interesting problem: a bunch of Struts Nested tags generate HTML. Separately, we write some Javascript that makes use of getElementById() to find some of the generated elements. This works in Internet Explorer, but fails miserably in FireFox. Why?
Well, it turns out that Struts Nested tags generate elements that have a name attribute but not an id. Separately, IE actually does the wrong thing with getElementById(): if a search by id fails, it will try to match by name; that’s fundamentally broken. It’d be fine if a bunch of libraries and other functions didn’t prefer the use of ids, and if other browsers did the same thing. They don’t and we’re stuck with the mess. Let’s clean it up.
The right thing to do would be to cripple the IE version into the...
In Java 5, as all good Java developers will know, Sun introduced the enum type. Since I’m sure anyone who is interested in what will follow knows that already, I won’t bore you with the details but there’s some decent historical information on Sun’s reasons available. I’m going to be talking a little bit about operations on enums, so let’s get started by defining one:
public enum OrderState{
PENDING, CHECKING_CREDIT, PROCESSING, SHIPPED, RECEIVED, CANCELLED, RETURNED
}
Each of those items in the enumeration represent some state that an order can be in; an order being anything you can buy from an online store. We’re also going to have a variable called currentState which will hold one of these enumerated items. Let’s not think too hard...
When we use the pre-cursor ‘biblical’ to justify something we are offering endorsement to rapists, liars, thiefs and dictators, just because the bible documents something, it does not call us to emulate it, without first excercising discernment. Sent from BlackBerry® wireless device Similar Posts:None Found...
Tha mi air a bhith 'sgrùdadh airson fiosrachadh mu dheidhinn an t-seòrsa Gàidhlig a bha air bruidhinn ann an Gallaibh mus do chaochail i 'moch 'san linn mu dheireadh (uill, chan eil mi cìnnteach, ach tha mi ag amas air lorg a-mach a dh' aithghearr). Aig an àm seo, tha direach rud beag agam, ach rud beag co-dhiù.
Tha am facal smiorcadh, a' ciallachadh gu eibhinn gu leòr 'ciall' no 'gaisgeachd' no 'neart', gin de na cill seo. Cha robh duine aig a' bheil mòran fiosrach air cuisean Gaidhealach eòlach oirre idir, agus 's ann an Ùist a Deas a bha e. Mar sin, bha rudeigin sònraichte a' dol ann an Gallaibh, fiù ma cha robh ach aon facal annasach ann!!!
's ann an t-abairt sileadh-sùith a tha a' comharrachadh ri ùisghe a thigeadh tron mullach na...
http://www.nasa.gov/centers/jpl/news/earthquake-051905.html
Cha robh an crith-thalmhainn bhos an seo an-diugh cho laidir, ag innse an fhirinn. Ach 's iongnadh nach bi tuilleadh dhiubh ann.
Tha taghadh de bhideoan an seo:
http://www.latimes.com/video/?slug=la-me-earthquake30-2008jul30-ap
'S e seo an rud as inntinniche dhomh:
http://www.shakemovie.caltech.edu/...
Uill, cha Hebridean Celtic Festival e ach bidh e tachairt ann an eilean co-dhiù. De th’ann ach ‘Eilean Phunc 2008’. Tha e gabhail àite a’ bhliadhna-sa air Eilean Chathair Amain, no Cramond Island sa chànan eile air Disathairne 16mh Lùnastal. Gu h-ìongatach, bidh Niall Iain bho BBC Alba an-lathair gus rudeigin a dhèanamh airson a’ phrògram ciùil Rapal. Cia mheud punc no Gaidheal aig a bheil meas air tachartasan annasach a bhios ann? Se tìde a dh’innseas. Cò tha cluich? Uill gu ruige seo cha chreid mi nach bi ann ach Oi Polloi aig a bheil a’ Ghàidhlig. Ach, tha comhlan ‘meatailt’ air a bheil Ablach gu bhith ann cuideachd. Ainm math co-dhiù! Coltach nach bi Cliar ann ge-tà. Nach truagh sin. Bu mhath leamsa Na Gathan fhaicinn. Mar sin dheth, dèan iarrtas...
Naidheachdan Pinc:
"Tha an t-Urras Nàiseanta AIDS (NAT) a-nis ag ràdh gum bu chòir do chlann ionnsachadh mu feise agus càirdeis co-sheòrsach sna sgoiltean."
http://cristean-macmhicheil.co.uk/naidheachdanpinc/index.php/2008/07/carthanas-aids-airson-clann-ionnsachadh-mu-dheidhinn-feise-co-sheorsach-sna-sgoiltean/...
Naidheachdan Pinc:
"Tha luchd-rannsachaidh ag obair aig Sgoil Slàinte Oilthigh Teagsas (Texas?) ag ràdh gu bheil iad air laigse aig HIV (Bhioras Dìon-slàinte Daonna) lorg."
http://cristean-macmhicheil.co.uk/naidheachdanpinc/index.php/2008/07/luchd-saidheans-air-laigse-aig-hiv-lorg/...
Chan eil mi ag iarraidh ach iPhone beag. Carson nach eil iPhonaichean gu leòr anns na bùitean? Tha mi a' fuirich anns an tìr Apple fhèin ach chan urrainn dhomh iPhone a lorg idir idir idir....
Websites which have address forms for UK residences, whether for buying new products, paying bills or registering interest, I have a simple request: do not presume your database knows my address better than me.
For the benefit of non-UK readers, let me explain. The UK has a system originally designed for mail delivery called the Postcode, which is similar to the US zip code system. Unlike zip codes, it’s far more granular, generally resolving to a handful of addresses. In fact, most of the time, if you have a post code and house number, you can uniquely identify a particular delivery address. That’s all that is needed: a G1 4BQ and a 35.
In 7 characters, most people can be readily identified. That’s the power of postcodes.
A lot of UK websites take this as an absolute...
When I saw in last Monday’s Guardian that Charlie Brooker was taking aim at 9/11 conspiracy theories, I hoped that he’d use his wide audience to present a logically watertight argument, in an entertainingly acerbic register. And buried within his piece was the quite probable suggestion that the paperwork alone would be impossible to conceal. Unfortunately, because he’s evidently paid by the ad hominem, he also said that every conspiracy theorist might as well believe that he is the Emperor of Pluto, and unleashed a firestorm in the online comments. By opening up too many fronts in this debate, he left himself open to attacks, even from other Guardian commentators.
Let us consider a single event from 9/11: the collapse of 7 World Trade Center, a 47-storey skyscraper which...
My last post concerned the conspiracy theories that surround the collapse of 7 World Trade Center on the 11th of September, 2001. In that post, I tried to provide an objective rationale for why the controlled demolition hypothesis should not be believed, owing to its unfalsifiability. The truth is that this and other 9/11 conspiracy theories provoke an almost visceral response in me. I am pretty certain that I’m not the only person who feels this way.
Right now, it’s pretty obvious that I don’t believe in the conspiracy theories (at least, the ones in which the US government or one of its agencies “made it happen on purpose”). However, I am no great supporter of the present US administration, and my political leanings (if transposed to America) would be...
5 more films for the fight…
Gone Baby Gone is the long delayed directorial debut of Ben Affleck (delayed due to the theme of child kidnapping being a little too close to the bone over the last year), and as debuts go it’s not bad. The mainstay of the plot is reasonable enough: kid gets kidnapped, private investigators who know the locals get involved, there’s more than meets the eye. The performances are for the most part decent, with one outstanding performance put in by Ed Harris; one scene in particular, we see some absolute brilliance in his act. All that said, the film is too clever for its own good. There are too many attempts at pulling the wool over the audiences eyes or twisting a little bit too much for comfort. A shame, because the film is solid, if nothing...
test post please ignore list list Quoting: Insert text here End of PostSimilar Posts:None Found...
Another month, another 4 films…
Iron Man is the first film in Marvel’s attempt to reboot their film universe, after some fairly awful entries. The failings of this film are the same for most Hollywood action films: they’re made for what is expected to be the lowest common denominator (that great, traditional cinema has a more universal appeal is a debate for another post, but think of something like Goodfellas). The plot is fairly moronic, being nothing more than an attempt to tell the origin story quickly and get onto a series of CGI action sequences and cameos (for other Marvel characters). Big, loud, and fast. As the genre goes, it’s not a terrible entry: Robert Downey Jr. is an inspired choice, even if Tony Stark has gone from obsessive alcoholic genius, the...
I know, I know, it’s late again. It’s been a fair while since I’ve seen these but let’s crack on anyway.
Funny Games is shot for shot remake of a German film of the same name (by the same director), about the commercialisation and desensitisation of violence in the media. Told through the eyes of a family who are held against their will, it takes us on a fairly dark journey, using some impressively lengthy shots to force us to keep watching. The direction and camera work is pretty flawless throughout, as is the dialogue; perfunctory and sharp. The film is an unerringly focussed on it’s core questions of “Have you seen enough yet?” and “Is this still entertaining?” It succeeds masterfully. Highly recommended.
Rod Hilton has done another...
In London with no wifi at the moment but I mentioned a little while ago that Scott Prather had given me some of Stanley Hauerwas’ ethics lectures, I’ve been working through some of the lectures and found that I very much enjoyed his opening prayers, so I will share one for you below, I enjoy his irony and sense of genuine engagement in Prayer:
“Lord, thou know us, better than I know myself, that I am growing older and will someday be old,
Keep me from the fatal habit of thinking I must say something on every subject and on every occasion, release me from craving to straighten out everybodies affairs
Make me thoughtful, but not moody,
Helpful, but not bossy,
With my vast store of wisdom it seems a pity not to use it all, but thou knowest Lord that I want a few...
“Hope, for the Christian, is not wishful thinking or mere blind optimism. It is a mode of knowing, a mode within which new things are possible, options are not shut down, new creation can happen.”
- Surprised by Hope, Tom WrightSent from BlackBerry® wireless deviceSimilar Posts:None Found...
Athchuinge ur airson Alba fhaighinn air leine rugbaidh na h-Alba:
http://www.petitiononline.com/cleague/petition.html...
