On Wed, Aug 8, 2012 at 3:30 AM, Peter <[email protected]> wrote:
> Hi, > > I have a repo at The repo is at > chiselapp.com/user/ppdb/**repository/dbapp<http://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? > The file you added has a SHA1 hash of da4330622b70534183526620cbfd81ba4b6c97b8 but you have shunned that SHA1. Hence the file appears to be deleted. > > Cheers, > > -- > > Peter Hardman > ______________________________**_________________ > fossil-users mailing list > [email protected].**org <[email protected]> > http://lists.fossil-scm.org:**8080/cgi-bin/mailman/listinfo/**fossil-users<http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users> > -- D. Richard Hipp [email protected]
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
