Artifact
c7e406f7d239d9b0fc49742c8bedaf0029670506:
Ticket change
[c7e406f7d2]
- New ticket [1d50540ec5]
Merging branches with a renamed file.
by
anonymous
2011-02-07 18:31:16.
D 2011-02-07T18:31:16.209
J comment If\syou\supdate\sto\sa\sbranch\sand\smove\sa\sfile\sto\sa\sdirectory\sthat\sdoesn't\sexist\sin\sthe\smainline\stree,\sa\smerge\swill\sfail.\r\n\r\nIn\sa\snew\srepository\s(in\stcsh(1):\s<code>alias\sfs\sfossil</code>):\r\n\r\n<pre>echo\s"hello"\s>\sbar.txt\r\nfs\sadd\sbar.txt\r\nfs\sci\s-m\s"Creating\sa\sbranch"\s--branch\srename_bug\sbar.txt\r\nmkdir\sfoo\r\nfs\smv\sbar.txt\sfoo/bar.txt\r\nmv\sbar.txt\sfoo/bar.txt\r\nfs\sci\s-m\s"Moved\sbar.txt\sto\sfoo/"\r\nfs\sup\smaster\r\nfs\smerge\srename_bug</pre>\r\n\r\nThe\sexpected\serror\soutput\sis:\r\n\r\n<pre>fossil:\sSQLITE_BUSY:\sstatement\saborts\sat\s2:\s[ROLLBACK]\scannot\srollback\stransaction\s-\sSQL\sstatements\sin\sprogress</pre>\r\n\r\nIf\syou\spipe\sthe\smerge\sto\sa\sfile\sand\sdon't\scapture\sstderr,\syou\sshould\sbe\sable\sto\sspot\sthe\sproblem:\r\n\r\n<pre>fossil:\scannot\sopen\s"/private/tmp/fs-merge-bug/foo/bar.txt"\sfor\swriting</pre>\r\n\r\nI\sthink\sit\sshould\sbe\spretty\seasy\sto\sreplicate\sthe\sproblem.\r\n\r\nI'm\sspeculating,\sbut\sit\slooks\slike\sthe\seasiest\sfix\sis\sto\supdate\ssrc/file.c:file_copy()\sto\sbe\supdated\sto\screate\sthe\sdestination\sdirectory\sif\sit\sdoesn't\sexist.\s\sOn\sthe\sflip\sside,\sgiven\sthe\sdirectory\spermissions,\smaybe\sit's\sbetter\sto\sjust\sappend\san\serror\smessage\sto\sthe\soutput\swhen\sthe\scommand\sfinishes\srolling\sback\sthe\smerge?\s\sFood\sfor\sthough\sI\ssuppose.
J foundin d5729c31b5
J private_contact 84f59114b7eee7088fd7e2932599c69c9ad0761b
J severity Minor
J status Open
J title Merging\sbranches\swith\sa\srenamed\sfile
J type Code_Defect
K 1d50540ec50335beef3ee228185392d694c3b66a
U anonymous
Z da7781736979d6b0e8f8c4ea99b969aa