Artifact
d6327224db5e93787cfb4774c5fa90a0bbf56e3f:
Ticket change
[d6327224db]
- New ticket
[288be8f321da6e81|288be8f321] <i>wrong right-side numbering when viewing diff</i>.
by
anonymous
2016-07-11 05:11:51.
D 2016-07-11T05:11:51.306
J foundin head
J icomment right\shand\sside\shas\sline\snumbers\sfrom\sleft\shand\sside.\s\sFor\sexample:\r\n<pre>\r\n----------------------------\r\n$\secho\s1\s>\sfoo.txt;\r\n$\secho\s0\s>\sbar.txt;\scat\sfoo.txt\s>>\sbar.txt\r\n$\sdiff\s-u\sfoo.txt\sbar.txt\r\n---\sfoo.txt\t2016-07-10\s21:53:36.671932638\s-0700\r\n+++\sbar.txt\t2016-07-10\s21:53:54.739860205\s-0700\r\n@@\s-1\s+1,2\s@@\r\n+0\r\n\s1\r\n$\sdiff\s-u\sfoo.txt\sbar.txt\s|\s./main.tcl\s-\r\n----------------------------\r\n</pre>\r\n\r\nExpected:\r\nright\shand\sside\shas\sline\snumbers\s1\sand\s2\r\n\r\nActual:\sright\shand\sside\shas\sline\snumbers\s1\sand\s1\r\n\r\nApparently,\sthis\scaused\sby\ssimple\stypo.\s\sPatch\sto\sfix\sthe\sproblem:\r\n<pre>\r\n$\sfossil\sdiff\ssrc/eskil.tcl\r\n----------------------------\r\nIndex:\ssrc/eskil.tcl\r\n==================================================================\r\n---\ssrc/eskil.tcl\r\n+++\ssrc/eskil.tcl\r\n@@\s-1239,18\s+1239,18\s@@\r\n\s\s\s\s\s\s\s\s\s\s\s\s\sif\s{![regexp\s{^[\\s+-]}\s$line]}\scontinue\r\n\s\s\s\s\s\s\s\s\s\s\s\s\sset\ssig\s[string\strim\s[string\sindex\s$line\s0]]\r\n\s\s\s\s\s\s\s\s\s\s\s\s\sset\sstr\s[string\srange\s$line\s1\send]\r\n\s\s\s\s\s\s\s\s\s\s\s\s\sif\s{$sig\seq\s""}\s{\r\n\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\slappend\sleftLines\s[list\s$leftLine\s""\s$str]\r\n-\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\slappend\srightLines\s[list\s$leftLine\s""\s$str]\r\n+\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\slappend\srightLines\s[list\s$rightLine\s""\s$str]\r\n\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\sincr\sleftLine\r\n\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\sincr\srightLine\r\n\s\s\s\s\s\s\s\s\s\s\s\s\s}\selseif\s{$sig\seq\s"-"}\s{\r\n\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\slappend\sleftLines\s[list\s$leftLine\s"-"\s$str]\r\n\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\sincr\sleftLine\r\n\s\s\s\s\s\s\s\s\s\s\s\s\s}\selse\s{\r\n-\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\slappend\srightLines\s[list\s$leftLine\s"+"\s$str]\r\n+\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\slappend\srightLines\s[list\s$rightLine\s"+"\s$str]\r\n\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\sincr\srightLine\r\n\s\s\s\s\s\s\s\s\s\s\s\s\s}\r\n\s\s\s\s\s\s\s\s\s\s\s\s\scontinue\r\n\s\s\s\s\s\s\s\s\s}\r\n\s\s\s\s\s}\r\n\r\n----------------------------\r\n<pre>
J login anonymous
J mimetype text/x-fossil-wiki
J private_contact d444f6313690a4a7800ac3f865cf78402edd8167
J severity Important
J status Open
J title wrong\sright-side\snumbering\swhen\sviewing\sdiff
J type Code_Defect
K 288be8f321da6e812974e9cd6311fa33d2388656
U anonymous
Z 5425876bf309761dd25f93770a374e26