noah@behemoth: ~/www/hyperbind/project/trunk/hyperbind $ svn stat
M      core/locale.py
noah@behemoth: ~/www/hyperbind/project/trunk/hyperbind $ svn ci -m 'test
message'
Sending        hyperbind/core/locale.py
svn: Commit failed (details follow):
svn: Your file or directory 'locale.py' is probably out-of-date
svn: The version resource does not correspond to the resource within the transaction.  Either the requested version resource is out of date (needs to be updated), or the requested version resource is newer than the transaction root (restart the commit).
noah@behemoth: ~/www/hyperbind/project/trunk/hyperbind $ svn up
At revision 284.
noah@behemoth: ~/www/hyperbind/project/trunk/hyperbind $ svn stat
M      core/locale.py
noah@behemoth: ~/www/hyperbind/project/trunk/hyperbind $ svn ci -m 'test
message'
Sending        hyperbind/core/locale.py
svn: Commit failed (details follow):
svn: Your file or directory 'locale.py' is probably out-of-date
svn: The version resource does not correspond to the resource within the transaction.  Either the requested version resource is out of date (needs to be updated), or the requested version resource is newer than the transaction root (restart the commit).
noah@behemoth: ~/www/hyperbind/project/trunk/hyperbind $ svn diff
Index: core/locale.py
===================================================================
--- core/locale.py      (revision 284)
+++ core/locale.py      (working copy)
@@ -147,7 +147,7 @@
     accept_language = http.parse_qvalues(
         request.headers.get('Accept-Language'))
 
-    preferred_language = request.cookies.get('preferred_language') or None
+    preferred_language = request.cookies.get('preferred_language', None)
 
     logger.debug(accept_language)
     logger.debug(preferred_language)