Mercurial > kallithea

changeset 4037:48142e84bdc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compare: only warn about missing ancestor if a 'merge' diff was requested
author Mads Kiilerich <madski@unity3d.com>
date Wed, 26 Jun 2013 00:13:15 +0200
parents 4fb3a7286e7b
children ed50319aab94
files rhodecode/controllers/compare.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/controllers/compare.py	Tue Jun 25 20:26:16 2013 +0200
+++ b/rhodecode/controllers/compare.py	Wed Jun 26 00:13:15 2013 +0200
@@ -222,8 +222,8 @@
 
         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')