Rev 3496: add a comment about no_merge in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/annotation

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/annotation

------------------------------------------------------------
revno: 3496
revision-id: john at arbash-meinel.com-20080617211951-t49i75urkd2rctz4
parent: john at arbash-meinel.com-20080617204640-p23gxho19zcyqu7m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotation
timestamp: Tue 2008-06-17 16:19:51 -0500
message:
  add a comment about no_merge
-------------- next part --------------
=== modified file 'bzrlib/annotation_policy/no_merge.py'
--- a/bzrlib/annotation_policy/no_merge.py	2008-06-17 20:46:40 +0000
+++ b/bzrlib/annotation_policy/no_merge.py	2008-06-17 21:19:51 +0000
@@ -20,7 +20,11 @@
 
 
 class NoMergeAnnotationPolicy(annotation_policy.AnnotationPolicy):
-    """Assign all lines based on the primary parent"""
+    """Assign all lines based on the primary parent.
+    
+    We don't implemement "_do_resolve_ambiguous" because it should not be
+    possible to have ambiguous lines when you only compare with 1 parent.
+    """
 
     def _do_annotate_two_parents(self, first_parent_lines,
                                  first_matching_blocks,