Ignore commits after the merge

lib/tree_builder.py

@@ -12,7 +12,6 @@ class TreeBuilder:
         ret = []
         prev = None
         for rev in revisions:
-            print(rev, rev.files_hash)
             if rev.broken:
                 continue
             if prev and prev.files_hash == rev.files_hash:
@@ -35,5 +34,8 @@ class TreeBuilder:
                         req.source_project, req.source_package
                     )
                 for rev2 in source_revisions.get(key):
+                    # this happened after the fact - possibly a revert
+                    if rev2.commit_time > rev.commit_time:
+                        continue
                     if rev2.files_hash == rev.files_hash:
                         print("    ", rev2)