D 2011-03-04T11:22:14.492
J comment When:\r\n\s\s*\s\sA\sfile\sis\sadded\sin\sa\sprivate\sbranch\r\n\s\s*\s\sThis\sprivate\sbranch\sis\spushed\sto\sa\sremote\sserver\r\n\s\s*\s\sThis\sbranch\sis\slocally\smerged\sto\sa\spublic\sbranch\r\n\s\s*\s\sThe\smerge\sis\spushed\sto\sthe\sremote\sserver\r\n\r\nA\sfossil\sscrub\s--private\sexecuted\sdirectly\son\sthe\sremote\sserver\swill\sdelete\sthe\scontent\sof\sthe\sfile.\r\n\r\nHow\sto\sreproduce:\r\n<code>$\sfossil\snew\sa.fossil\r\n\r\n$\sfossil\sclone\sfile://a.fossil\sb.fossil\r\n\r\n$\smkdir\stest\r\n\r\n$\scd\stest\r\n\r\n$\secho\s"abcd"\s>test.txt\r\n\r\n$\sfossil\sadd\stest.txt\r\n\r\n$\sfossil\scommit\s-m"test"\s--private\r\n\r\n$\scd\s..\r\n\r\n$\sfossil\ssync\s-R\sa.fossil\sfile://b.fossil\s--private\r\n\r\n$\scd\stest\r\n\r\n$\sfossil\scheckout\strunk\r\n\r\n$\sfossil\smerge\sprivate\r\n\r\n$\sfossil\scommit\s-m"test"\r\n\r\n$\scd..\r\n\r\n$\sfossil\ssync\s-R\sa.fossil\sfile://b.fossil\s--private\r\n\r\n$\sfossil\sscrub\sb.fossil\s--private\r\n\r\n$\sfossil\sui\sb.fossil</code>\r\n\r\nBrowse\sthe\sfiles\sand\sobserve\sthat\sthe\scontent\sof\stest.txt\sis\smissing.\r\n\r\nI\sthink\sthat\sthe\sproblem\sis\sthat\swhen\sfossil\sreceives\sa\snon-private\smanifest\sthat\spoints\sto\sa\sfile\sthat\swas\spreviously\sprivate,\sit\sshould\smark\sthat\sfile's\scontent\sas\spublic\sand\sit\sdoesn't.
J foundin ae89a7ce79
J private_contact ba07c6d5d3c5e044f8238154a7f39762cc1663cc
J severity Important
J status Open
J title fossil\sscrub\s--private\ssometimes\sremove\sprivate\sfiles\sthat\shave\sbeen\smerged\sinto\spublic\sbranches
J type Code_Defect
K 5f194e2c8f475ce9d5e8bde058c1e97d683f3ce5
U anonymous
Z e90afa7ea7b6116bf495046869410b7a