/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/msgeditor.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/msgeditor.py
102
102
 
103
103
    if not start_message is None:
104
104
        start_message = start_message.encode(bzrlib.user_encoding)
105
 
    return edit_commit_message_encoded(infotext.encode(bzrlib.user_encoding),
106
 
                                       ignoreline, start_message)
 
105
    infotext = infotext.encode(bzrlib.user_encoding, 'replace')
 
106
    return edit_commit_message_encoded(infotext, ignoreline, start_message)
107
107
 
108
108
 
109
109
def edit_commit_message_encoded(infotext, ignoreline=DEFAULT_IGNORE_LINE,