Artifact e7c03e841f5fcb03dde916a6281450c28e9b5d5d:

Ticket change [e7c03e841f] - New ticket [5751755d47] Initial check-in isn't usable. by anonymous 2010-06-23 07:00:09.

---

D 2010-06-23T07:00:09
J comment I\swant\sto\shandle\svendor\sbranches\sin\sa\sreasonable\smanner.\r\nI'm\strying\sto\sdo\sthe\sfollowing:\scommit\svendor\sversion\r\ninto\sbranch\sand\smerge\sthe\sresult\sonto\strunk.\r\n\r\nInitial\ssteps:\r\n\r\n$\smkdir\s/tmp/bug;\scd\s/tmp/bug\r\n$\sfossil\snew\sbug\r\nproject-id:\sa4f5ac4cd49798bac13036300ab62f021b7f5388\r\nserver-id:\s\sd9e3d87cd655de7631396980dc753002ede0316c\r\nadmin-user:\sasau\s(initial\spassword\sis\s"ea9c71")\r\n$\smkdir\stest;\scd\stest;\sfossil\sopen\s../bug\r\n$\sfossil\stimeline\r\n===\s2010-06-23\s===\r\n06:42:52\s[cef303f2f8]\s*CURRENT*\sinitial\sempty\scheck-in\s(user:\sasau\stags:\strunk)\r\n\r\nLet's\stry\sto\simport\svendor\sversion\sand\smerge\sit\sonto\strunk:\r\n\r\n$\s:>\stest\r\n$\sfossil\sadd\stest\r\nADDED\s\stest\r\n$\sfossil\sci\s--branch\svendor-version\s-m\s"Import\svendor\sversion."\r\nNew_Version:\s3ae4f0043b0d330d828d3712961ae9027f33ea61\r\n$\sfossil\sclose\r\n$\srm\s-f\s*\r\n$\sfossil\sopen\s../bug\strunk\r\nfossil:\sobject\s[cef303f2f8]\sis\snot\sa\scheck-in\r\n\r\n???\r\n\r\n$\sfossil\smerge\svendor-version\r\nfossil:\slack\sboth\sprimary\sand\ssecondary\sfiles\r\n\r\n???\r\n\r\nIt\sdoesn't\swork,\ssomehow\s"initial\scheck-in"\sis\stoo\sspecial\sto\sbe\sa\s"check-in".\r\nWork\saround\sis\sto\screate\sanother\sempty\scheck-in:\r\n\r\n$\sfossil\sci\s-f\s-m\s"Commit\sempty\schanges\sto\swork\saround."\r\nNew_Version:\s43da68d6ed8fd95d9728801a2ede65f0090d5e61\r\n$\sfossil\stimeline\r\n===\s2010-06-23\s===\r\n06:45:09\s[43da68d6ed]\s*CURRENT*\sCommit\sempty\schanges\sto\swork\saround.\s(user:\r\n\s\s\s\s\s\s\s\s\sasau\stags:\strunk)\r\n06:43:56\s[3ae4f0043b]\sImport\svendor\sversion.\s(user:\sasau\stags:\svendor-version)\r\n06:42:52\s[cef303f2f8]\s*BRANCH*\sinitial\sempty\scheck-in\s(user:\sasau\stags:\strunk)\r\n$\sfossil\smerge\svendor-version\r\nADDED\stest\r\n$\sfossil\sci\s-m\s"Merge\svendor\sversion."\r\nNew_Version:\s5ea37a73c292159210ba89de2315ea202f9afb9d\r\n$\sfossil\sclose\r\n\r\nIt\swould\sbe\snice\snot\sto\srequire\sthis\sworkaround.
J foundin 3343450e64
J private_contact 77d1fb9b8673fda6e5de8f02a6ad22d96857b3e1
J severity Important
J status Open
J title Initial\scheck-in\sisn't\susable
J type Code_Defect
K 5751755d47d959f5b1d55761abd4308d8b8ea9bb
U anonymous
Z d43c43baae05af173324f4e16da4a261