Hi,

I have a repo at The repo is at chiselapp.com/user/ppdb/repository/dbapp


I've just merged the 'pyschema' branch into trunk in checkin 51db6403c7.

During the development of this branch I added a file to trunk in checkin f0f13ff63d.

After the merge the file is now missing from trunk. There were no merge conflict warnings.

This is not what I expected - is it correct behaviour? Or did I do something 
wrong?

Cheers,

--

Peter Hardman
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to