Artifact 514a4e8ed4ca0683769c8605205cd8269c3ab2b1:

Ticket change [514a4e8ed4] - New ticket [9ac3352f15] After merge, revert -- "update" refuses to cooperate. by ron 2010-01-25 05:13:31.

---

D 2010-01-25T05:13:31
J comment Updated\sto\sthe\s'ssl'\sbranch\sof\sthe\sFossil\scode.\s\sAfter\sa\swhile,\sdid\sa\s'merge\s--cherrypick'\sto\sget\sparticular\schange.\s\s\r\n\r\nThen\sdecided\sto\sabandon\sthe\schanges,\sso\sdid\s'revert'.\s\sFossil\supdated\sthe\schanged\sfiles.\r\n\r\nNow,\swhen\sdoing\s"update",\sFossil\ssays:\s<tt>fossil:\scannot\supdate\san\suncommitted\smerge</tt>
J foundin c4c231069e4bde488725c80689c834106a969b44
J private_contact ddae85699df0ae84ab8e0a6a6dacf72bab6d4a7a
J severity Important
J status Open
J title After\smerge,\srevert\s--\s"update"\srefuses\sto\scooperate
J type Code_Defect
K 9ac3352f157bb62b4a484cf470622eac39e87117
U ron
Z fafe265c40f34699028e3b2152e23898