From 77d2f08a5ce3b968a7638ffc2a557f9a3d763dc5 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Tue, 18 Aug 2020 08:12:35 -0400 Subject: [PATCH] show more info in merge conflict error message --- archivebox/index/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archivebox/index/__init__.py b/archivebox/index/__init__.py index f8118966..d11db8c7 100644 --- a/archivebox/index/__init__.py +++ b/archivebox/index/__init__.py @@ -63,7 +63,7 @@ def merge_links(a: Link, b: Link) -> Link: """deterministially merge two links, favoring longer field values over shorter, and "cleaner" values over worse ones. """ - assert a.base_url == b.base_url, 'Cannot merge two links with different URLs' + assert a.base_url == b.base_url, f'Cannot merge two links with different URLs ({a.base_url} != {b.base_url})' # longest url wins (because a fuzzy url will always be shorter) url = a.url if len(a.url) > len(b.url) else b.url