Artifact
c734ef53f0202b2a2cf184edebabe9f09010471a:
Ticket change
[c734ef53f0]
- New ticket [30b28cf351]
Merge to the checkout (on update) fails, if with renames.
by
viriketo
2011-06-07 19:07:11.
D 2011-06-07T19:07:11.283
J comment While\sa\smerge\sbetween\sbranches\smay\swork,\swith\sa\sclean\scheckout,\sit\sfailed\sfor\sme\sto\srecognise\sthe\srenames\sI\shad\son\smy\scheckout\sat\sthe\stime\sof\srunning\s"fossil\supdate".\r\n\r\nCommitting,\sresulting\sin\sa\sfork\sof\sthe\sbranch,\sand\sthen\smerging\sthe\sleaves\swith\sa\sclean\scheckout,\sworked\sas\sa\strivial\smerge.\r\n\r\nLuckily\s'fossil\supdate'\sinvites\sto\sundo,\sand\sthe\sharm\sis\sthen\sminimum.
J foundin [9f9047d686]
J severity Important
J status Open
J title Merge\sto\sthe\scheckout\s(on\supdate)\sfails,\sif\swith\srenames
J type Code_Defect
K 30b28cf351fd81c2a30541e3eb9b6f25a67d5931
U viriketo
Z 1143a90f04cdb3520c2a4fa3bb5d79e3