From d961c136149063964261af5edf6d09c8eb1d9b24 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.de>
Date: Tue, 25 Oct 2022 13:24:08 +0200
Subject: [PATCH] Ignore commits after the merge

---
 lib/tree_builder.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/tree_builder.py b/lib/tree_builder.py
index 2e06d1b..cc2a2e8 100644
--- a/lib/tree_builder.py
+++ b/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)