Merge lp:~parthm/bzr/81689-win-symlink-warning into lp:bzr
Status: | Work in progress |
---|---|
Proposed branch: | lp:~parthm/bzr/81689-win-symlink-warning |
Merge into: | lp:bzr |
Diff against target: |
472 lines (+197/-62) 11 files modified
bzrlib/commit.py (+12/-6) bzrlib/delta.py (+7/-3) bzrlib/diff.py (+4/-0) bzrlib/errors.py (+0/-15) bzrlib/mutabletree.py (+25/-7) bzrlib/tests/test_commit.py (+31/-0) bzrlib/tests/test_errors.py (+0/-14) bzrlib/tests/test_transform.py (+61/-11) bzrlib/tests/test_workingtree.py (+35/-0) bzrlib/transform.py (+17/-6) doc/en/release-notes/bzr-2.6.txt (+5/-0) |
To merge this branch: | bzr merge lp:~parthm/bzr/81689-win-symlink-warning |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Packman (community) | Needs Fixing | ||
bzr-core | Pending | ||
Review via email: mp+93784@code.launchpad.net |
Description of the change
Hello,
This branch contains changes to allow checkout/branch of repositories containing symlinks on Windows platform. The approach is to simply ignore symlinks and issue a warning about unsupported symlinks when commands like branch, status, diff and commit are run. This is discussed https:/
The patch isn't quite ready for merge yet and I still need to write additional tests. Just wanted to put this up here so I can improve it based on review comments and the general approach is validated. Thanks.
Below is the sample command interaction on Windows.
=======
D:\ext-src>brun branch lp:~parthm/+junk/project-with-symlink
Unable to creat symlink "softlink" on this platform.
Branched 2 revisions.
D:\ext-src>cd project-
D:\ext-
hardlink hello
D:\ext-
Ignoring "softlink" as symlinks are not supported on this platform.
D:\ext-
Ignoring "softlink" as symlinks are not supported on this platform.
D:\ext-
Committing to: D:/ext-
missing softlink
Ignoring "softlink" as symlinks are not supported on this platform.
bzr: ERROR: No changes to commit. Please 'bzr add' the files you want to commit,
or use --unchanged to force an empty commit.
=======
Unmerged revisions
- 6491. By Parth Malwankar
-
update release notes
- 6490. By Parth Malwankar
-
SymlinkFeature required for test
- 6489. By Parth Malwankar
-
added commit test
- 6488. By Parth Malwankar
-
added merge test
- 6487. By Parth Malwankar
-
renamed test
- 6486. By Parth Malwankar
-
merged in trunk
- 6485. By Parth Malwankar
-
added diff test
- 6484. By Parth Malwankar
-
added test. warning now explicit
- 6483. By Parth Malwankar
-
moved release info to 2.6
- 6482. By Parth Malwankar
-
merged in trunk
Hi Parth,
Thanks for working on this. If there's anything I can help with, please let me know. :)