Merge lp:~lifeless/bzr/bug-3918 into lp:bzr/2.0
Proposed by
Robert Collins
Status: | Merged |
---|---|
Approved by: | Andrew Bennetts |
Approved revision: | no longer in the source branch. |
Merged at revision: | not available |
Proposed branch: | lp:~lifeless/bzr/bug-3918 |
Merge into: | lp:bzr/2.0 |
Diff against target: |
94 lines 3 files modified
NEWS (+31/-0) bzrlib/mutabletree.py (+5/-0) bzrlib/tests/per_workingtree/test_smart_add.py (+12/-0) |
To merge this branch: | bzr merge lp:~lifeless/bzr/bug-3918 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrew Bennetts | Approve | ||
Review via email: mp+12505@code.launchpad.net |
To post a comment you must log in.
This avoids adding filenames containing \r or \n to the dirstate via 'bzr add', which prevents a common source of 'wtf' for people with odd trees that they are importing via the command line.