Artifact 3154ff7d77376e7b6941084428e5f5aaae8429bd:

Ticket change [3154ff7d77] - Ticket [93112ea7e8] Timeline graph for trunk not straight status still Closed with 1 other change by drh 2010-11-16 14:35:10.

---

D 2010-11-16T14:35:10
J comment Screenshot:\s[http://imgpaste.com/i/mqnwd.png]\r\n\r\nNormal\sbranch,\sdo\sa\sfew\scheck-ins,\sthen\smerge\sbranch\swith\strunk.\sWould\sexpect\sgraph\sfor\strunk\s(white)\sto\sstay\sas\sa\sstraight\sline\son\sthe\sleft\swhile\sthe\sbranch\s(pink)\sbehaves\sas\sit\sdoes.\sTrunk\scurving\saround\sthe\sright\sof\sthe\sbranch\sand\sthen\sback\sseems\sa\sbit\sodd\sand\svisually\sconfusing.\r\n\r\n<hr\s/><i>drh\sadded\son\s2010-11-16\s12:09:43:</i><br\s/>\r\nThe\sthin\sline\srepresents\sa\smerge.\s\sYou\sdidn't\smerge\syour\sbranch\sback\sinto\r\nthe\strunk\s-\syou\srenamed\syour\sbranch\sas\s"trunk"\sbeginning\sat\scheck-in\r\n<nowiki>[6523fd3854]</nowiki>\sand\sthen\smerged\sthe\sold\strunk\sinto\syour\sbranch\s(now\scalled\s"trunk").\r\n\r\nThat's\san\sinteresting\sway\sof\sdoing\sit.\s\sBut\sit\sshould\sgive\sthe\ssame\sresult\r\nas\sif\syou\shad\smerge\sthe\sbranch\sinto\sthe\strunk.\s\sSo\sno\sharm\sdone.\r\n\r\nThe\sgraph\scorrectly\sshows\swhat\syou\sdid.\s\sThe\sthin\smerge-lines\snever\sstay\son\r\nthe\ssame\s"rail"\sas\sthe\sthicker\sancestry\slines.\s\sThat\sis\sby\sdesign.
K 93112ea7e802f65c763bb4067f7831dae4117546
U drh
Z b6ae31b46c740d32ad8a31e21dfb7de6