D 2011-08-26T14:50:33.456
J comment (as\sreported\sby\sMarty\sBacke)\r\n<blockquote>\r\nFor\sfiles\sthat\shave\sa\smerge\sconflict,\sthe\s'baseline',\s'original',\sand\r\n'merge'\sfiles\sget\screated\son\smy\slocal\sfile\ssystem.\sAll\sother\sfiles\sthat\r\nwould\sget\supdated\sdo\snot\sget\supdated\s(the\sexpected\sresult\swith\sthe\s-n\r\noption).\r\n</blockquote>\r\n\r\nEither\sthose\sfiles\sshouldn't\sbe\screated\sfor\s-n,\sor,\sif\sthey\sare\sa\snecessity,\sbe\sdeleted\safterwards.\sI\sagree\swith\sMarty\sthat\sthe\sstate\sof\sthe\scheckout\sshould\sbe\sthe\ssame\sbefore\sand\safter\sfossil\supdate\s-n.
J foundin 1.18
J private_contact d38fef6d436c103985ac22b73ebb173fb648156c
J severity Minor
J status Open
J title fossil\supdate\s-n\sclutters\scheckout\son\sfailed\smerge
J type Code_Defect
K ee9243c5c77572b490093937c3b0d8041c9a60f4
U martin.weber
Z 0e0da5680de747349dd80cd1d74096a5