Rev 401: Note a limitation of the merge_changelog code. in http://bzr.arbash-meinel.com/branches/bzr/bzr-builddeb/changelog-hook

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/bzr-builddeb/changelog-hook

------------------------------------------------------------
revno: 401
revision-id: john at arbash-meinel.com-20100128113749-wy3b7epu6wn0cwdb
parent: john at arbash-meinel.com-20100128113025-ei8809wjgv7x3mug
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: changelog-hook
timestamp: Thu 2010-01-28 05:37:49 -0600
message:
  Note a limitation of the merge_changelog code.
-------------- next part --------------
=== modified file 'merge_changelog.py'
--- a/merge_changelog.py	2010-01-28 11:16:05 +0000
+++ b/merge_changelog.py	2010-01-28 11:37:49 +0000
@@ -46,6 +46,14 @@
     right_cl = read_changelog(right_changelog_lines)
 
     content = []
+    # TODO: This is not a 3-way merge, but a 2-way merge
+    #       The resolution is currently 'if left and right have texts that have
+    #       the same "version" string, use left', aka "prefer-mine".
+    #       We could introduce BASE, and cause conflicts, or appropriately
+    #       resolve, etc.
+    #       Note also that this code is only invoked when there is a
+    #       left-and-right change, so merging a pure-right change will take all
+    #       changes.
     for right_ver, right_text in right_cl:
         while len(left_cl) and left_cl[0][0] > right_ver:
             (left_ver, left_text) = left_cl.pop(0)