D 2011-04-25T10:55:55.856
J comment Not\ssure\sif\sthis\sshould\sgo\shere\sor\sin\sthe\smail-list,\sbut\sI've\sencountered\sthe\sfollowing\r\nproblem:\r\n\r\n<verbatim>C:\\test>fossil\snew\stest.fossil\s&&\sfossil\sopen\stest.fossil\r\nproject-id:\s0ee562040ef8d3f09796012b3a2695a6f6be535f\r\nserver-id:\s\sf2268a01c5c2ca258f893483398f677e26d12743\r\nadmin-user:\sUser\s(initial\spassword\sis\s"62d5e3")\r\n\r\nC:\\test>echo\sA>foo.txt\s&&\sfossil\sadd\sfoo.txt\r\nADDED\s\sfoo.txt\r\n\r\nC:\\test>fossil\sci\s-m\s"Added\sfoo.txt"\r\nNew_Version:\s77476f7b51d992410a2e5c29bbecd3407d642fc5\r\n\r\nC:\\test>echo\sB>foo.txt\r\n\r\nC:\\test>fossil\sci\s-m\s"Branching\soff\sthe\strunk"\s--private\r\nNew_Version:\sb3311a70dbc8c5584373300f6a64e60d57e63c32\r\n\r\nC:\\test>echo\sC>foo.txt\s&&\sfossil\sci\s-m\s"Working"\r\nNew_Version:\s43453f074f5f874d1dd65f494282f99972864404\r\n\r\nC:\\test>move\sfoo.txt\sbar.txt\s&&\sfossil\smv\sfoo.txt\sbar.txt\r\nRENAME\sfoo.txt\sbar.txt\r\n\r\nC:\\test>fossil\sci\s-m\s"Renaming"\r\nNew_Version:\se079ebf753cb630acfab51c272ef5a915a63d1bd\r\n\r\nC:\\test>echo\sD>foo.txt\s&&\sfossil\sadd\sfoo.txt\r\nADDED\s\sfoo.txt\r\n\r\nC:\\test>fossil\sci\s-m\s"Adding\s(new)\sfoo.txt"\r\nNew_Version:\s99c5b0ffa3f88a38bea6d0f7323669122c3e0c54\r\n\r\nC:\\test>fossil\sco\strunk\r\nfoo.txt\r\n\r\nC:\\test>fossil\smerge\sprivate\r\nUPDATE\sfoo.txt\r\nRENAME\sfoo.txt\s->\sbar.txt\r\n"fossil\sundo"\sis\savailable\sto\sundo\schanges\sto\sthe\sworking\scheckout.\r\n\r\nC:\\test>fossil\sci\s-m\s"Private\schanges"\r\nNew_Version:\sacf09654a00da5ee5633ce90d32d27332b95668e\r\n\r\nC:\\test>fossil\sls\r\nbar.txt\r\n</verbatim>\r\n\r\nthen\sfoo.txt\swas\srestored\sfrom\san\sextrenal\ssource\s(same\sversion\sas\sin\sprivate\sbrunch)\sbecause\sI\shad\sno\stime\sto\scheck\swhat\swas\shappened;\sand\r\nnow\sI\scannot\smerge\sat\sall:</em>\r\n\r\n<verbatim>\r\nC:\\test>fossil\sci\s-m\s"Added\sback\sfoo.txt"\r\nNew_Version:\s310e7a6762e0e1df88f5b9e21d560ce77e6c2d83\r\n\r\nC:\\test>fossil\sco\sprivate\r\nbar.txt\r\nfoo.txt\r\n\r\nC:\\test>echo\sE>foo.txt\s&&\sfossil\sci\s-m\s"WIP"\r\nNew_Version:\sf7edf6d1669aa61b88630bd10a657099d25cd2e3\r\n\r\nC:\\test>fossil\sco\strunk\r\nbar.txt\r\nfoo.txt\r\n\r\nC:\\test>fossil\smerge\s-n\sprivate\r\nMERGE\sbar.txt\r\nMERGE\sfoo.txt\r\n*****\s1\smerge\sconflicts\sin\sfoo.txt\r\nRENAME\sfoo.txt\s->\sbar.txt\r\nC:\\WINDOWS\\system32\\fossil.exe:\sSQLITE_CONSTRAINT:\sabort\sat\s37\sin\s[UPDATE\svfile\sSET\spathname='bar.tx\r\nt',\sorigname=coalesce(origname,pathname)\sWHERE\sid=8\sAND\svid=12]:\scolumns\spathname,\svid\sare\snot\suniqu\r\ne\r\nC:\\WINDOWS\\system32\\fossil.exe:\scolumns\spathname,\svid\sare\snot\sunique\r\nUPDATE\svfile\sSET\spathname='bar.txt',\sorigname=coalesce(origname,pathname)\sWHERE\sid=8\sAND\svid=12\r\n\r\nIf\syou\shave\srecently\supdated\syour\sfossil\sexecutable,\syou\smight\r\nneed\sto\srun\s"fossil\sall\srebuild"\sto\sbring\sthe\srepository\r\nschemas\sup\sto\sdate.\r\nC:\\WINDOWS\\system32\\fossil.exe:\sSQLITE_BUSY:\sstatement\saborts\sat\s2:\s[ROLLBACK]\scannot\srollback\strans\r\naction\s-\sSQL\sstatements\sin\sprogress\r\n</verbatim>\r\n\r\nWas\sit\smy\sfault\sor\sis\sit\sa\sbug?\s<strong>What\sshould\sI\sdo\snow</strong>\sto\scontinue\sworking\swith\sthis\srepository?
J foundin 047e06193b
J private_contact 7dbf398b8524d19867c9afaa7207ea0a602e4458
J severity Severe
J status Open
J title Problem\swith\smv\sand\smerge
J type Incident
K 7e0e4755c6d0b4e7ebea28617eac25eb17a50bcc
U anonymous
Z d2f60c8667e55e7112aec83f5f00eeda