On Tue, Oct 28, 2014 at 12:42 PM, Richard Hipp <d...@sqlite.org> wrote:
> When the merge from trunk into dave occurred (check-in c2d7402366) there > were merge conflicts on the fsl_cx.c file. (You can see this by doing > "fossil up 81f67b; fossil merge 6c18a25;") These merge conflicts were > manually resolved, and it is at that step that the lines went messing from > fsl_cx.c. > > The missing lines seem to have been added to trunk by check-in > 889657e03c. They never existed in the dave branch. When trunk was merge > into dave at c2d7404366 those lines were removed again (manually, as part > of the merge conflict resolution). Then the removal was transferred back > into trunk by the merge into trunk at 61233f6026. > > Fossil seems to have done everything correctly, as far as I can tell. > Thanks for the investigation and explanation - we might have come to that conclusion eventually if timezone lag wasn't slowing our email exchanges down ;). i wasn't aware of the merge conflict over in the dave branch - that was the missing piece of the puzzle. Not a bug, in any case. Thanks! -- ----- 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
