Hello, we had a computer with a clock problem (its clock showed the time as two hours less, in the same timezone). At some point the 'trunk' last checkin was newer than 'branch' checkin, and the user run in 'branch': fossil merge trunk
That ended up with all the changes from trunk ported, but the manifest was noted as a *single parent*, as if no merge happened. Of course the commit for this merge had a time *sooner* than the 'trunk' checkin it was merging from. Although these are a problematic conditions, shouldn't fossil have noted the merge properly? I just wonder if this behaviour is by chance or by design. Regards, Lluís. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
