1
=== modified file 'NEWS'
2
--- NEWS	2010-07-17 17:19:40 +0000
3
+++ NEWS	2010-07-17 17:19:40 +0000
4
@@ -18,6 +18,11 @@
5
18
  history no longer crash when deleted files are involved.
18
  history no longer crash when deleted files are involved.
6
19
  (Vincent Ladeuil, John Arbash Meinel, #375898)
19
  (Vincent Ladeuil, John Arbash Meinel, #375898)
7
20
20
8
21
* ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
9
22
  previously-unversioned directory within the tree: the directory is
10
23
  marked versioned too.  
11
24
  (Martin Pool, #192859)
12
25
13
21
* ``bzr commit SYMLINK`` now works, rather than trying to commit the
26
* ``bzr commit SYMLINK`` now works, rather than trying to commit the
14
22
  target of the symlink.
27
  target of the symlink.
15
23
  (Martin Pool, John Arbash Meinel, #128562)
28
  (Martin Pool, John Arbash Meinel, #128562)
16
24
29
17
=== modified file 'bzrlib/mutabletree.py'
18
--- bzrlib/mutabletree.py	2010-07-17 17:19:40 +0000
19
+++ bzrlib/mutabletree.py	2010-07-17 17:19:40 +0000
20
@@ -389,6 +389,10 @@
21
389
        dirs_to_add = []
389
        dirs_to_add = []
22
390
        user_dirs = set()
390
        user_dirs = set()
23
391
391
24
392
        # expand any symlinks in the directory part, while leaving the
25
393
        # filename alone
26
394
        file_list = map(osutils.normalizepath, file_list)
27
395
28
392
        # validate user file paths and convert all paths to tree
396
        # validate user file paths and convert all paths to tree
29
393
        # relative : it's cheaper to make a tree relative path an abspath
397
        # relative : it's cheaper to make a tree relative path an abspath
30
394
        # than to convert an abspath to tree relative, and it's cheaper to
398
        # than to convert an abspath to tree relative, and it's cheaper to
31
395
399
32
=== modified file 'bzrlib/tests/per_workingtree/test_symlinks.py'
33
--- bzrlib/tests/per_workingtree/test_symlinks.py	2010-07-17 17:19:40 +0000
34
+++ bzrlib/tests/per_workingtree/test_symlinks.py	2010-07-17 17:19:40 +0000
35
@@ -55,6 +55,25 @@
36
55
        self.assertEqual('symlink',
55
        self.assertEqual('symlink',
37
56
            tree.kind(tree.path2id('link')))
56
            tree.kind(tree.path2id('link')))
38
57
57
39
58
    def test_add_file_under_symlink(self):
40
59
        # similar to 
41
60
        # https://bugs.launchpad.net/bzr/+bug/192859/comments/3
42
61
        tree = self.make_branch_and_tree('tree')
43
62
        self.build_tree_contents([
44
63
            ('tree/link@', 'dir'),
45
64
            ('tree/dir/',),
46
65
            ('tree/dir/file', 'content'),
47
66
            ])
48
67
        self.assertEquals(
49
68
            tree.smart_add(['tree/link/file']),
50
69
            ([u'dir', u'dir/file'], {}))
51
70
        # should add the actual parent directory, not the apparent parent
52
71
        # (which is actually a symlink)
53
72
        self.assertTrue(tree.path2id('dir/file'))
54
73
        self.assertTrue(tree.path2id('dir'))
55
74
        self.assertIs(None, tree.path2id('link'))
56
75
        self.assertIs(None, tree.path2id('link/file'))
57
76
58
58
77
59
59
class TestKindChanges(TestCaseWithWorkingTree):
78
class TestKindChanges(TestCaseWithWorkingTree):
60
60
79
Reviewer	Review Type	Date Requested	Status
bzr-core		2010-07-17	Pending
Review via email: mp+30183@code.launchpad.net