# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2013-06-25 22:13:15
# Node ID 48142e84bdc864aa22813c34b742a5e981382924
# Parent  4fb3a7286e7b90d7840415a22a4940d98cea28c5

compare: only warn about missing ancestor if a 'merge' diff was requested

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')