Hi, all, Dave noticed a weird thing today while trying to do what appeared to be a routine merge...
here's the timeline of reference: http://fossil.wanderinghorse.net/repos/libfossil/index.cgi/timeline?c=2014-10-27 During that time Dave merged trunk into his branch and everything is great. He then makes one more commit to his branch before trying to merge his branch to the trunk. He noticed, however, that while there were no conflicts, several bits from one of the recent trunk commits were missing, specifically much (but not all) of this commit: http://fossil.wanderinghorse.net/repos/libfossil/index.cgi/info/898c0acbff9c365b34539a5d86d7e6dae57727e6 (the 2nd commit made on the 27th) He reported it to me, and locally i get the same thing: a clean merge of only a few files, but notable chunks of 898c0ac are missing. Using gdiff i was able to piece it back together with little effort, but we're both very puzzled as to why fossil chose to remove those pieces during the merge. To reproduce this, clone that repo: fossil clone http://fossil.wanderinghorse.net/repos/libfossil/index.cgi libfossil.fsl open it somewhere, then: - checkout version 6c18a25f11 (last commit from the 27th) - merge 6e12a39c1ae3 - diff -tk that. The majority of the red blocks on the left (in fsl_cx.c) were added by 898c0ac and not removed since then. We're not yet claiming this is a bug, but we'd like to understand what happened here. i've seen such things in svn many times, but so far never in fossil. Disclaimer: though we're hacking on libfossil, this was done using fossil(1). Any insights? -- ----- stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal "Freedom is sloppy. But since tyranny's the only guaranteed byproduct of those who insist on a perfect world, freedom will have to do." -- Bigby Wolf
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
