Sometimes I spend considerable time resolving merge conflicts between git branches that's absolutely bogus.
What I need is just "take a remote branch content and shut up".
But despite there is -s ours there's no -s remote.
What I'm missing?
Just have blogged that twill bugs me. So here's the fix. As always, dead simple to locate the guilty and patch it.
If you'll open twill/utils.py and scroll down to the line 408, you'll find equiv-refresh header parsing code.
Here are the guilty lines:
...
Image via WikipediaIt's Friday night after hectic work week and I'm too tired to investigate further, but....
It feels to me that twill breaks following http equiv-refreshes from the code. See the debug output:
reply: 'HTTP/1.0 200 OK\n'
header: Vary: Accept-Language, Cookie
header: Content-Type: text/html; charset=utf-8
header: Content-Language: en
equiv-refresh DEBUG: code 200, hdrs has ...
Ok, nosetests whitewashed in one of accused misactions - it didn't actually messed up with the metadata of my django database backend. It was me, myself.
Looks like my test wrappers db_mock and twill_mock where not quite up to date to latest django db backend changes and forgot to save ...
Good to see that satchmo multishop branch is merged into the trunk. Bad is that this is not reflected on the MultiShop wiki page - had to waste some time and even try to start a fork on multishop branch to update it to django 1.0...
Image via Wikipedia Spent several hours yesterday untangling yet another mysterious test crash:
Warning: Field 'id' doesn't have a default value
As appears, it happened during usual INSERT to djangocontenttype... WTF!?
mysql> describe django_content_type;
+-----------+--------------+------+-----+---------+-------+
| Field | Type | Null ...
Image via Wikipedia Tracking svn repository with a git is a pleasure, thanks to git-svn:
git svn clone (svn url)
and go.
But until today it wasn't clear to me how to add an svn for already existing git project. For example, if a client requested to push the progress to his ...
Have yet to think out how to handle those django-hotclub numerous svn:externals. Git advise given here is nice (I'm following the same route), but it doesn't answer the issue of managing the regular single-command deployment of those dependencies.
On the other hand, packaging each of these packagelets into tiny RPMs ...
