...
svn: Commit failed (details follow):
svn: Item
'/branches/ticket_416/tests/test_merchants/ut06-css-merchant/customer_mail.tmpl'
is out of date
$ svn up
At revision 6641.
Er, right. You *say* it's out of date, but if I try to make it up to date,
you say that it is already. Yet I get the same error. I have no clue how to
fix this, because you're failing to tell me what is actually wrong. Am I
somehow magically supposed to know that this:
$ svn st tests/test_merchants/ut06-css-merchant/customer_mail.tmpl
R + tests/test_merchants/ut06-css-merchant/customer_mail.tmpl
means that you can't cope with merging a routine set of operations, and I
have to force-bodge something? Painfully. Sideways. It's so tempting.
Hateful software.
Nicholas Clark
