Artifact 646e9326c84a5daa9c4fced3b279eefee106bcf6:

Ticket change [646e9326c8] - New ticket [7326efdc56] Misleading summary of merge troubles at the end of merge. by viriketo 2011-05-02 08:34:46.

---

D 2011-05-02T08:34:46.064
J comment After\sdoing\sa\sbranch\smerge,\sI\snoticed\sthe\soutput\shas\sbeen:\r\n<verbatim>\r\n$\sfossil\smerge\strunk\r\nWARNING\s-\sno\scommon\sancestor:\sdrivers/a.cpp\r\nWARNING\s-\sno\scommon\sancestor:\sdrivers/b.cpp\r\nWARNING\s-\sno\scommon\sancestor:\sdrivers/c.cpp\r\nWARNING\s-\sno\scommon\sancestor:\sdrivers/d.cpp\r\nWARNING\s-\sno\scommon\sancestor:\sdrivers/e.cpp\r\nWARNING\s-\sno\scommon\sancestor:\sdrivers/f.cpp\r\nWARNING\s-\sno\scommon\sancestor:\sdrivers/g.cpp\r\nWARNING\s-\sno\scommon\sancestor:\sdrivers/h.cpp\r\nADDED\scmake/FindXXX.cmake\r\n....\r\nmany\sADDED/UPDATE\r\n"fossil\sundo"\sis\savailable\sto\sundo\schanges\sto\sthe\sworking\scheckout.\r\nfos\r\n$\r\n</verbatim>\r\n\r\nI\sthought\sthat\son\smerge\stroubles,\s'fossil\smerge'\swas\sgiving\sa\swarning\sabout\sthe\stroubles\sat\sthe\send\sof\sthe\smerge,\sbut\sin\sthis\scase\sit\sdid\snot.\r\n\r\nShouldn't\sit\sgive\sa\swarning,\sas\swhen\sthere\sare\sother\sconflicts?\r\n\r\nThank\syou.
J foundin [047e06193b]\s2011-04-13
J status Open
J title Misleading\ssummary\sof\smerge\stroubles\sat\sthe\send\sof\smerge
J type Code_Defect
K 7326efdc56644af3ea859e98b822c169e69c9092
U viriketo
Z ae9c3666e9c3250a1890b124baadb4ce