diff --git a/rhodecode/controllers/compare.py b/rhodecode/controllers/compare.py --- a/rhodecode/controllers/compare.py +++ b/rhodecode/controllers/compare.py @@ -222,8 +222,8 @@ class CompareController(BaseRepoControll c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in c.cs_ranges]) - if not c.ancestor: - log.warning('Unable to find ancestor revision') + if merge and not c.ancestor: + log.error('Unable to find ancestor revision') if partial: return render('compare/compare_cs.html')