Artifact 34748258303944b2c9924de2d07a1a96d62b7f7a:

Ticket change [3474825830] - Ticket [24e1e78fa3] Files in conflict are not marked as so status still Open with 2 other changes by anonymous 2010-10-15 14:03:15.

---

D 2010-10-15T14:03:15
J +comment \n\n<hr\s/><i>anonymous\sclaiming\sto\sbe\sJoerg\sSonnenberger\sadded\son\s2010-10-15\s14:03:15:</i><br\s/>\nThere\sare\stwo\spotential\squestions\srelated\sto\sthis:\r\n\r\n(1)\sShould\sfossil\salways\sscan\sfor\sthe\smarkers\son\sfiles\swith\smodified\smtime.\sThis\sworks\sfor\sconflicts\sfrom\smanual\spatches\stoo.\sIt\shas\sthe\sstrong\sdisadvantage\sof\srequiring\sreading\spotentially\slarge\sfiles\sto\sdetermine\sthe\sconflict.\sSuch\sa\scheck\sshould\sat\sleast\sbe\sdone\spre-commit,\sI\sthink.\r\n\r\n(2)\sShould\sconflict\sresolution\sbe\simplicit\sor\sexplicit?\sI'm\snot\sa\sfan\sof\sthe\sMercurial\sapproach\sof\sexplicit\s"hg\sresolve",\sbut\sit\shas\sits\smerits\stoo.\sAt\sthe\svery\sleast,\sit\swould\smake\sthe\sstatus\soperation\svery\scheap\sand\sforce\speople\sto\smore\sexplicit\sthink\sabout\sit.
J resolution Open
K 24e1e78fa301399e5711c3786594819445694668
U anonymous
Z d904fe65bfa8951f1d7efb33aa2d492a