##// END OF EJS Templates
compare: only warn about missing ancestor if a 'merge' diff was requested
Mads Kiilerich -
r4037:48142e84 default
parent child Browse files
Show More
@@ -222,8 +222,8 b' class CompareController(BaseRepoControll'
222
222
223 c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in
223 c.statuses = c.rhodecode_db_repo.statuses([x.raw_id for x in
224 c.cs_ranges])
224 c.cs_ranges])
225 if not c.ancestor:
225 if merge and not c.ancestor:
226 log.warning('Unable to find ancestor revision')
226 log.error('Unable to find ancestor revision')
227
227
228 if partial:
228 if partial:
229 return render('compare/compare_cs.html')
229 return render('compare/compare_cs.html')
General Comments 0
You need to be logged in to leave comments. Login now