Artifact 5e0ca28d45071c799970deeca2fc346c5ce10c02:

Ticket change [5e0ca28d45] - Ticket [554f44ee74] Interbranch interference with merges and renames status still Open with 2 other changes by viriketo 2011-06-14 15:17:02.

---

D 2011-06-14T15:17:02.974
J +comment \n\n<hr\s/><i>viriketo\sadded\son\s2011-06-14\s15:17:02\sUTC:</i><br\s/>\nNotice\sin\s'tmp.fossil'\show\sI\screated\sa\sbranch\snamed\s"branch".\sThis\shas\sa\srename\sfrom\s'a'\sto\s'b',\sand\sis\snever\smerged\s*into*\strunk.\r\n\r\nWhile\sworking\son\sthe\s"branch2",\sand\supdating\sbranch2\sfrom\strunk,\sthe\sfile\s'a'\sgets\sdeleted\swhen\srunning:\s"fossil\smerge\strunk".
J resolution Open
K 554f44ee74e3d3b9b24edd358f2bc3d8284f9ce5
U viriketo
Z 40a9f9cb86189137f839daffa31bd2e2