On Sat, Dec 12, 2015 at 02:47:59PM +0000, org.fossil-scm.fossil-us...@io7m.com wrote: > On 2015-12-12T14:21:19 +0000 > <org.fossil-scm.fossil-us...@io7m.com> wrote: > > > > Ideally, I'd be able to reproduce this with a somewhat smaller > > repository... > > Surprisingly, this turned out to be easier than expected! > > http://waste.io7m.com/2015/12/12/fossilexport/ > > 1. Create fossil repository. > 2. Add README.txt and commit in trunk. > 3. Create branch 'b0' and switch to it. > 4. Add README-b0.txt and commit in b0. > 5. Switch to trunk. > 6. Merge and commit 'b0'. > [snip] > > Importing that results in no README-b0.txt existing in the 'trunk' > branch of the created git repository. > > I don't understand what's going wrong yet, but at least we now have > a repro case. >
What version of git and fossil are you using ? I cannot reproduce the problem using your repo case. After the merge, the README-b0.txt file is present. Here a script that reproduce your repo case, does it correspond to your test case ? regards, -- Martin G.
ff.sh
Description: Bourne shell script
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
