Change git-rebase-update to always keep branch 'master'.

fix_encoding.py

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Collection of functions and classes to fix various encoding problems on
 multiple platforms with python.
 """
 
 import codecs
 import locale
@@ skipping 211 matching lines @@
             self._console_handle, text,
             min(remaining, 10000),
             self._byref(n), None)
         if retval == 0 or n.value == 0:
           raise IOError(
               'WriteConsoleW returned %r, n.value = %r, last error = %r' % (
                 retval, n.value, self._GetLastError()))
         remaining -= n.value
         if not remaining:
           break
-        text = text[n.value:]
+        text = text[int(n.value):]
     except Exception, e:
       complain('%s.write: %r' % (self.name, e))
       raise
 
 
 class WinUnicodeOutput(WinUnicodeOutputBase):
   """Output adaptor to a file output on Windows.
 
   If the standard FileWrite function is used, it will be encoded in the current
   code page. WriteConsoleW() permits writting any character.
@@ skipping 119 matching lines @@
   if sys.platform == 'win32':
     ret &= fix_win_codec()
 
   ret &= fix_default_encoding()
 
   if sys.platform == 'win32':
     encoding = sys.getdefaultencoding()
     ret &= fix_win_sys_argv(encoding)
     ret &= fix_win_console(encoding)
   return ret