D 2010-10-14T13:59:18
J comment When\stracking\sthird\sparty\ssource,\sit\sis\suseful\sto\shave\sit\son\sseparate\sbranch\sand\smerge\sonto\strunk\sas\sneeded.\r\nThis\sdoesn't\swork\sin\sFossil:\r\n<pre>\r\nrm\s-rf\s/tmp/fossil-merge-bug\r\nmkdir\s/tmp/fossil-merge-bug\r\ncd\s/tmp/fossil-merge-bug/\r\nfossil\snew\sbug.fossil\r\nmkdir\sbug\r\ncd\sbug\r\necho\s"vendor\sversion"\s>\stest\r\nfossil\sopen\s../bug.fossil\s\r\nfossil\sadd\stest\r\nfossil\sci\s--branch\svendor\s-m\s"Import\svendor\ssource."\r\nfossil\sclose\r\nrm\s-rf\s*\r\nfossil\sopen\s../bug.fossil\strunk\r\necho\s===\sAttemt\sthe\smerge...\s===\r\nfossil\smerge\svendor\r\n</pre>\r\n\r\nThe\sscript\soutput\shere\sis:\r\n<pre>\r\nproject-id:\s3f2182fb3f096d5197fa8788ff73a14c62d9b7b9\r\nserver-id:\s\sd908e77a1322004ebae2cceeb10ea32689ee611d\r\nadmin-user:\sasau\s(initial\spassword\sis\s"485164")\r\nADDED\s\stest\r\nNew_Version:\sf7f55946e4adbab2523aa38f08e15e519b16ce01\r\nproject-name:\s<unnamed>\r\nrepository:\s\s\s/tmp/fossil-merge-bug/bug.fossil\r\nlocal-root:\s\s\s/tmp/fossil-merge-bug/bug/\r\nproject-code:\s3f2182fb3f096d5197fa8788ff73a14c62d9b7b9\r\nserver-code:\s\sd908e77a1322004ebae2cceeb10ea32689ee611d\r\ncheckout:\s\s\s\s\s10a4088889fec65a08f69899969e3e8e51a9de8d\s2010-10-14\s13:54:22\sUTC\r\nchild:\s\s\s\s\s\s\s\sf7f55946e4adbab2523aa38f08e15e519b16ce01\s2010-10-14\s13:54:23\sUTC\r\ntags:\s\s\s\s\s\s\s\s\strunk\r\ncomment:\s\s\s\s\s\sinitial\sempty\scheck-in\s(user:\sasau)\r\n===\sAttemt\sthe\smerge...\s===\r\nfossil:\slack\sboth\sprimary\sand\ssecondary\sfiles\r\n</pre>
J foundin c845b28714
J private_contact 77d1fb9b8673fda6e5de8f02a6ad22d96857b3e1
J severity Important
J status Open
J title Merge\sonto\sempty\sbranch\sfails
J type Code_Defect
K 144180bf7db83724a9c647c60a411512cf605e50
U anonymous
Z f1aa481ea3cde095c30648fd7cc78b06