Merge lp://staging/~jelmer/brz/win-symlink-warning into lp://staging/brz
Proposed by
Jelmer Vernooij
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Jelmer Vernooij | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merge reported by: | The Breezy Bot | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://staging/~jelmer/brz/win-symlink-warning | ||||
| Merge into: | lp://staging/brz | ||||
| Prerequisite: | lp://staging/~jelmer/brz/osutils-fstype | ||||
| Diff against target: |
1002 lines (+362/-98) 27 files modified
breezy/bzr/dirstate.py (+15/-11) breezy/bzr/inventorytree.py (+1/-1) breezy/bzr/workingtree.py (+1/-0) breezy/bzr/workingtree_4.py (+2/-1) breezy/commit.py (+5/-0) breezy/delta.py (+8/-3) breezy/diff.py (+5/-0) breezy/errors.py (+0/-15) breezy/git/memorytree.py (+3/-0) breezy/git/tree.py (+7/-0) breezy/git/workingtree.py (+6/-8) breezy/memorytree.py (+3/-0) breezy/mutabletree.py (+27/-7) breezy/osutils.py (+57/-2) breezy/tests/per_tree/test_symlinks.py (+40/-0) breezy/tests/test__dirstate_helpers.py (+5/-3) breezy/tests/test_commit.py (+31/-0) breezy/tests/test_dirstate.py (+5/-3) breezy/tests/test_errors.py (+0/-14) breezy/tests/test_osutils.py (+21/-0) breezy/tests/test_transform.py (+55/-11) breezy/tests/test_workingtree.py (+33/-0) breezy/transform.py (+15/-10) breezy/transport/local.py (+1/-1) breezy/tree.py (+7/-1) breezy/workingtree.py (+4/-7) doc/en/release-notes/brz-3.0.txt (+5/-0) |
||||
| To merge this branch: | bzr merge lp://staging/~jelmer/brz/win-symlink-warning | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Packman | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2019-03-04.
Commit message
Allow symbolic links to exist when checking out trees on Windows.
Description of the change
Allow symbolic links to exist when checking out trees on Windows.
Warnings are printed for the symbolic links, but the rest of the tree is still
checked out. Operations that work across the tree and require on-disk access
(e.g. "commit", "diff", "status") will warn about the symbolic links but not
otherwise prentend that the files are missing.
To post a comment you must log in.
Revision history for this message
| The Breezy Bot (the-breezy-bot) wrote | # |
Revision history for this message
| The Breezy Bot (the-breezy-bot) wrote | # |
Revision history for this message
| The Breezy Bot (the-breezy-bot) wrote | # |
Revision history for this message
| The Breezy Bot (the-breezy-bot) wrote | # |
Revision history for this message
| The Breezy Bot (the-breezy-bot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks reasonable, see some inline comments.