Rev 3507: Change the annotation to be 'right-head' annotation in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/merge3_per_file

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 3507
revision-id: john at arbash-meinel.com-20080620225556-679khqi4j8oaeekv
parent: john at arbash-meinel.com-20080620213932-hb0lqdikv524vedp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge3_per_file
timestamp: Fri 2008-06-20 17:55:56 -0500
message:
  Change the annotation to be 'right-head' annotation
-------------- next part --------------
=== modified file 'bzrlib/annotate.py'
--- a/bzrlib/annotate.py	2008-04-24 07:22:53 +0000
+++ b/bzrlib/annotate.py	2008-06-20 22:55:56 +0000
@@ -285,15 +285,8 @@
                         output_append((iter(heads).next(), left[1]))
                     else:
                         # Both claim different origins
-                        output_append((revision_id, left[1]))
-                        # We know that revision_id is the head for
-                        # left and right, so cache it
-                        heads_provider.cache(
-                            (revision_id, left[0]),
-                            (revision_id,))
-                        heads_provider.cache(
-                            (revision_id, right[0]),
-                            (revision_id,))
+                        # give 'right' precedence
+                        output_append(right)
         last_child_idx = child_idx + match_len
 
 

=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2008-06-20 21:39:32 +0000
+++ b/bzrlib/merge.py	2008-06-20 22:55:56 +0000
@@ -1406,7 +1406,7 @@
         new = set()
         # Something really weird here, if do 'idx+1' I get ~ same results
         # That makes something seem really broken.
-        import pdb; pdb.set_trace()
+        # import pdb; pdb.set_trace()
         new.update([idx for idx, (source, line) in enumerate(annotated_text)
                          if source in self.uncommon])
         killed = set(unique_line_numbers).difference(new)