forked from importers/git-importer
Ignore commits after the merge
This commit is contained in:
parent
2784171f75
commit
d961c13614
@ -12,7 +12,6 @@ class TreeBuilder:
|
|||||||
ret = []
|
ret = []
|
||||||
prev = None
|
prev = None
|
||||||
for rev in revisions:
|
for rev in revisions:
|
||||||
print(rev, rev.files_hash)
|
|
||||||
if rev.broken:
|
if rev.broken:
|
||||||
continue
|
continue
|
||||||
if prev and prev.files_hash == rev.files_hash:
|
if prev and prev.files_hash == rev.files_hash:
|
||||||
@ -35,5 +34,8 @@ class TreeBuilder:
|
|||||||
req.source_project, req.source_package
|
req.source_project, req.source_package
|
||||||
)
|
)
|
||||||
for rev2 in source_revisions.get(key):
|
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:
|
if rev2.files_hash == rev.files_hash:
|
||||||
print(" ", rev2)
|
print(" ", rev2)
|
||||||
|
Loading…
Reference in New Issue
Block a user