Artifact 36e9820e97eca5b215bd646b58beffa04c4dc0b0:

Ticket change [36e9820e97] - New ticket [c26c63eb1b] 'merge --backout' does not handle conflicts properly. by anonymous 2011-02-10 11:36:02.

---

D 2011-02-10T11:36:02.025
J comment I\shad\ssome\scheckin\s(A)\sthat\sintroduced\sa\sbad\schange.\r\n\r\nThen\strying\sto\sfix\sit,\sI\smade\sa\snew\scheckin\s(B)\swith\ssome\schanges\sin\sthe\slines\sintroduced\sin\s(A).\r\n\r\nWhen\sI\ssaw\sthat\sthe\schange\sB\swas\snot\simproving\sthe\ssituation...\sI\sdecided\sto\srun\s"fossil\smerge\s--backout\sA".\sIt\stook\saway\sall\sthe\slines\sintroduced\sby\sA,\sbut\sit\sdid\snot\ssay\sanything,\sthat\sthe\slines\sin\sthe\sworking\sdirectory\swere\snot\sexactly\sthose\sintroduced\sby\sA.\r\n\r\nShouldn't\sit\ssay,\sthat\sthe\schange\sA\scannot\sbe\sbacked\sout\sdirectly,\sas\sit\shas\sconflicts\sintroduced\sby\sB?
J foundin [6f42e76d80]
J status Open
J title 'merge\s--backout'\sdoes\snot\shandle\sconflicts\sproperly
J type Code_Defect
K c26c63eb1b36b9e043413f120ee68beb635dfde5
U anonymous
Z 546b2bda4e360aceb1fe17463ccce9e0