Rev 3553: We have added the symlink tests, and now have covered all the ones I was aware of. in http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/merge_lca_multi

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/merge_lca_multi

------------------------------------------------------------
revno: 3553
revision-id: john at arbash-meinel.com-20080730223829-2wd0dm1ca4tqlguw
parent: john at arbash-meinel.com-20080730223749-wcofi4ccz4wzgkfk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_lca_multi
timestamp: Wed 2008-07-30 17:38:29 -0500
message:
  We have added the symlink tests, and now have covered all the ones I was aware of.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_merge.py'
--- a/bzrlib/tests/test_merge.py	2008-07-30 22:37:49 +0000
+++ b/bzrlib/tests/test_merge.py	2008-07-30 22:38:29 +0000
@@ -1981,9 +1981,6 @@
         self.assertEqual('F content\n', wt.get_file_text('foo-id'))
 
 
-    # TODO: cases to test
-    #       x-x Symlink targets, similar to file contents
-
 class TestLCAMultiWay(tests.TestCase):
 
     def assertLCAMultiWay(self, expected, base, lcas, other, this):