D 2011-01-26T22:25:20.993
J comment In\scase\sof\sa\smodified\sbinary\sfile,\sand\sa\slater\s"fossil\supdate"\staking\sin\schanges\sin\sthat\sfile,\sfossil\swill\soverwrite\sthe\slocal\sfile\swith\sthat\sincoming.\r\n\r\nIt\swill\sreport\sCONFLICT\son\sthat\sfile,\sleaving\s"fossil\sundo"\sas\sthe\sonly\soption\sto\sget\sthe\slocal\schanges\sback.\r\n\r\nA\suser\smay\sloose\schanges\sin\sthat\ssituation,\sif\she\sfails\sto\ssee\sthe\sCONFLICT\smessage.\sI\sthink\sthat\sfossil\sshould,\slike\ssubversion,\scopy\sthe\sfile\swith\slocal\schanges\sinto\sanother\sfilename\sin\sthe\ssame\sdirectory,\slike\s"myfile.odt~local".
J foundin [6f42e76d80]
J private_contact ccd87c60364e1d3e945b6f4d4874f5174b17cc43
J severity Important
J status Open
J title On\sconflict\sof\sbinary\sfiles\slocally,\sfossil\soverwrites\slocal\schanges
J type Code_Defect
K b081e09e28176eefdfd3a8a99d0d086205e890f0
U anonymous
Z d8a573a2db805bd3c561a4b600047ab4