D 2011-03-10T09:58:23.144
J comment When\smerging\sfiles\sfrom\sdifferent\sbranches,\sfossil\ssays\sit's\sadding\sa\sfile\sbut\sis\sonly\schecking\sit\sout\swithout\sadding\sit\sto\sthe\smanifest.\sTest\scase:\r\n\r\n<verbatim>%\sfs\sbranch\slist\r\n\s\sbranch1\r\n\s\sbranch2\r\n*\strunk\r\n#\sThe\sfollowing\sversion\swas\sfor\sa\scheckin\son\sbranch1\r\n%\sfs\sup\s9c21f3ec0f\sfoo.txt\r\nAutosync:\s\shttp://user@127.0.0.1:9023/\r\n\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s\sBytes\s\s\s\s\s\sCards\s\sArtifacts\s\s\s\s\sDeltas\r\nSent:\s\s\s\s\s\s\s\s\s\s\s\s\s130\s\s\s\s\s\s\s\s\s\s1\s\s\s\s\s\s\s\s\s\s0\s\s\s\s\s\s\s\s\s\s0\r\nReceived:\s\s\s\s\s\s\s\s\s446\s\s\s\s\s\s\s\s\s\s9\s\s\s\s\s\s\s\s\s\s0\s\s\s\s\s\s\s\s\s\s0\r\nTotal\snetwork\straffic:\s340\sbytes\ssent,\s0\sbytes\sreceived\r\nADD\sfoo.txt\r\n--------------\r\nupdated-to:\s\s\s9c21f3ec0ff598e7b24980e7c3fbe40556b2a5b1\s2011-03-06\s10:16:14\sUTC\r\ntags:\s\s\s\s\s\s\s\s\sbranch1\r\ncomment:\s\s\s\s\s\sCreate\sfoo.txt\son\sbranch1\s(user:\suser)\r\n"fossil\sundo"\sis\savailable\sto\sundo\schanges\sto\sthe\sworking\scheckout.\r\n#\sBased\son\sthe\sabove\soutput,\sI\swould\sexpect\sfoo.txt\sto\shave\sbeen\sadded\sto\sthe\srepo\r\n%\sll\r\ntotal\s1\r\n-rw-r--r--\s\s1\suser\s\suser\s\s\s\s0\sMar\s10\s09:50\sfoo.txt\r\n%\sfs\sstat\r\nrepository:\s\s\s/usr/home/user/src/.fossils/test.fossil\r\nlocal-root:\s\s\s/usr/home/user/src/test/\r\nserver-code:\s\s56efbf780dd31210ab1bd80be67ee2efc698440e\r\ncheckout:\s\s\s\s\s2f4775795dcc7eba912ebb7756e33f7d2b101427\s2011-03-08\s10:03:46\sUTC\r\nparent:\s\s\s\s\s\s\sf08368775537689a60c4b862c0896a33a23aa9dc\s2011-03-08\s09:56:13\sUTC\r\ntags:\s\s\s\s\s\s\s\s\strunk\r\ncomment:\s\s\s\s\s\sSome\scheckin\smsg.\s(user:\suser)\r\n%\sfs\sadd\sspammers.pftable\s\r\nADDED\s\sfoo.txt</verbatim>
J foundin c92ec16f81
J private_contact 84f59114b7eee7088fd7e2932599c69c9ad0761b
J severity Minor
J status Open
J title `fossil\sup\sVERSION\sfilename`\sdoesn't\sadd\sthe\sfile\sto\sthe\scurrent\sbranch
J type Code_Defect
K 91b3a6bfc1439f4cfda3c78e80bfb5e4bc7bd1d5
U anonymous
Z 8e13c690bd8a638ef3d656350b30b166