Artifact c7ac78d4ef1bdde01045980397fd6eda5f2b8314:

Ticket change [c7ac78d4ef] - Ticket [f91862eed3] annotations assign lines to incorrect checkin status still Open with 1 other change by drh 2011-05-12 00:50:48.

---

D 2011-05-12T00:50:48.730
J +comment \n\n<hr\s/><i>drh\sadded\son\s2011-05-12\s00:50:48\sUTC:</i><br\s/>\nThe\sfollowing\sis\san\sexplanation\sof\sthe\sproblem;\snot\sa\ssolution.\s\sI'm\sstill\r\nnot\ssure\swhat\sthe\scorrect\ssolution\sis.\s\sThe\sbottom\sline\sis\sthat\s"annotate"\r\nor\s"blame"\sbecomes\scomplicated\swhen\syou\shave\slots\sof\sbranching\sand\smerging...\r\n\r\nRefer\sto\sthe\shistory\sgraph\sof\sthe\stclListObj.c\ssource\sfile\shere:\r\n[http://core.tcl.tk/tcl/finfo?name=generic/tclListObj.c&b=2011-04-28&a=2011-04-24]\r\n\r\nThe\scurrent\simplementation\sof\s"annotate"\sstarts\swith\sthe\srequested\snode\r\n(31d1cfe5711802cc)\sand\sthen\sworks\sdownward\sfrom\sthere\son\sthe\ssame\sbranch\r\nto\s(66e766cf759f85cf)\sand\s(52cc348a24f17bca)\sand\sso\sforth.\s\sBut\sthe\sfive-line\r\nchange\smentioned\sin\sthe\sproblem\sstatement\sabove\scomes\sin\sfrom\sa\sdifferent\r\nbranch,\sspecifically\sfrom\s(e25d618ef36a26ce)\son\sthe\score-8-5-branch.\s\sSo\sthe\r\nfive-line\schange\sdoes\snot\sappear\sin\sthe\s"annotate"\soutput\sbecause\sit\sis\r\na\sdiff\sfrom\sone\sbranch\sinto\sanother,\swhereas\sthe\scurrent\s"annotate"\sonly\r\nshows\schanges\sfrom\sversions\son\sthe\ssame\sbranch.\r\n\r\nIt\sis\sunclear,\syet,\swhether\sor\snot\sit\sis\sdesirable\sto\sinclude\s"annotate"\r\nchanges\sfrom\sother\sbranches.\s\sPerhaps\sthis\sshould\sbe\san\soption\son\sthe\sdisplay.\r\nFurther\sresearch\sis\snecessary...
K f91862eed36716dec2129daf75060e4905cbc409
U drh
Z aa85b6b46a52ba38d164787f0e3dec60