Rev 3550: Clean up comments, only symlink support left. 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: 3550
revision-id: john at arbash-meinel.com-20080730212805-8zzead9mrwbn19w1
parent: john at arbash-meinel.com-20080730204837-w9gj1gjbvgusuuzu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_lca_multi
timestamp: Wed 2008-07-30 16:28:05 -0500
message:
  Clean up comments, only symlink support left.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_merge.py'
--- a/bzrlib/tests/test_merge.py	2008-07-30 20:48:37 +0000
+++ b/bzrlib/tests/test_merge.py	2008-07-30 21:28:05 +0000
@@ -1767,19 +1767,13 @@
         wt, conflicts = self.do_merge(builder, 'F-id')
         self.assertEqual(0, conflicts)
         # TODO: We need to use the per-file graph to properly select a BASE
-        #       before this will work.
+        #       before this will work. Or at least use the LCA trees to find
+        #       the appropriate content base. (which is B, not A).
         self.expectFailure("Merge3Merger doesn't recognize reverted content",
             self.assertEqual, 'base content\n', wt.get_file_text('foo-id'))
 
 
     # TODO: cases to test
-    #       simple criss-cross LCAS identical, BASE different
-    #       x-x changed from BASE but identical for all LCAs and tips
-    #               should be possible with the same trick of 'not-in-base'
-    #               using a double criss-cross
-    #       x-x LCAs differ, one in ancestry of other for a given file
-    #       x-x file missing in LCA
-    #       x-x Reverted back to BASE text
     #       x-x Symlink targets, similar to file contents
 
 class TestLCAMultiWay(tests.TestCase):