My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 885: Diff viewer shows blank line added instead of closing XML tag
1 person starred this issue and may be notified of changes. Back to list
Status:  Duplicate
Merged:  issue 853
Owner:  ----
Closed:  May 2011


Sign in to add a comment
 
Reported by dan...@gmail.com, Mar 21, 2011
Affected Version: 2.1.6

What steps will reproduce the problem?
1. Visit https://gerrit.djc.id.au/#patch,sidebyside,235,1,Server/bkr/server/templates/recipe_action.kid

What is the expected output? What do you see instead?

Diff viewer indicates that a blank line was added at line 9, but in fact (according to the patch that was originally submitted, and the patch when cloning from gerrit, and the commit as merged by gerrit) a closing </div> tag was added at line 8.

--- a/Server/bkr/server/templates/recipe_action.kid
+++ b/Server/bkr/server/templates/recipe_action.kid
@@ -1,7 +1,10 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#">
+<div>
+<a class='list' href="${task.clone_link()}">Clone RecipeSet</a><br/>
 <div py:if="show_report is not None">
  <a style='class:list;' href="${show_report}">Report problem with system</a>
 </div>
+</div>
 
 </html>


Please provide any additional information below.

The added line 8 is identical to the existing line 7 above it. Not sure if that could be confusing gerrit's diff algorithm?
May 20, 2011
Project Member #1 nas...@grainawi.org
(No comment was entered for this change.)
Status: Duplicate
Mergedinto: 853
Sign in to add a comment

Powered by Google Project Hosting