Merge lp:~mbp/bzr/192859-2.0-symlinks into lp:bzr/2.0
Proposed by
Martin Pool
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Martin Pool | ||||||||
Approved revision: | no longer in the source branch. | ||||||||
Merged at revision: | 4754 | ||||||||
Proposed branch: | lp:~mbp/bzr/192859-2.0-symlinks | ||||||||
Merge into: | lp:bzr/2.0 | ||||||||
Diff against target: |
271 lines (+160/-10) 9 files modified
NEWS (+11/-0) bzrlib/builtins.py (+1/-1) bzrlib/mutabletree.py (+4/-0) bzrlib/tests/__init__.py (+1/-0) bzrlib/tests/per_workingtree/__init__.py (+2/-1) bzrlib/tests/per_workingtree/test_symlinks.py (+98/-0) bzrlib/tests/test_treeshape.py (+41/-0) bzrlib/tests/test_upgrade.py (+0/-6) bzrlib/tests/treeshape.py (+2/-2) |
||||||||
To merge this branch: | bzr merge lp:~mbp/bzr/192859-2.0-symlinks | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pool | Approve | ||
Review via email: mp+30085@code.launchpad.net |
Commit message
fix specific commit of a symlink (bug 128562)
Description of the change
This doesn't yet fix bug 192859, but it does fix another popular symlink bug 128562: specific commit of a symlink tries to commit the referent of the symlink. The fix is embarrassingly small but we also add some tests.
For a followon landing to trunk we might move tree_files out of builtins.
To post a comment you must log in.
John paired on this and verbally approved it, so I'll send it in.