Merge lp://staging/~garyvdm/bzr/unicode_bom_detect into lp://staging/bzr
Proposed by
Gary van der Merwe
Status: | Work in progress | ||||
---|---|---|---|---|---|
Proposed branch: | lp://staging/~garyvdm/bzr/unicode_bom_detect | ||||
Merge into: | lp://staging/bzr | ||||
Diff against target: |
229 lines (+91/-17) 7 files modified
NEWS (+7/-0) bzrlib/diff.py (+2/-2) bzrlib/merge.py (+1/-1) bzrlib/merge3.py (+4/-4) bzrlib/shelf_ui.py (+2/-2) bzrlib/tests/test_textfile.py (+27/-6) bzrlib/textfile.py (+48/-2) |
||||
To merge this branch: | bzr merge lp://staging/~garyvdm/bzr/unicode_bom_detect | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Packman (community) | Needs Information | ||
bzr-core | Pending | ||
Review via email: mp+17076@code.staging.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 4952. By Gary van der Merwe
-
Update NEWS, and doc strings.
- 4951. By Gary van der Merwe
-
Use text_lines rather than check_text_lines.
- 4950. By Gary van der Merwe
-
Add text_file, which replaces check_text_lines. If a BOM encoding is detected, the lines are decoded, and returned.
- 4949. By Gary van der Merwe
-
Make text_file handle files with a BOM encoding.
- 4948. By Gary van der Merwe
-
Test text_file for files with a BOM encoding.
This makes files with a Unicode BOM correctly decoded and displayed in diff, merge, and shelve.