On Tue, Oct 28, 2014 at 5:27 AM, Stephan Beal <sgb...@googlemail.com> wrote:
> > > 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: > > > 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. -- D. Richard Hipp d...@sqlite.org
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
