Apparently I checked that feature in. But I don't remember doing it. I do not use it myself and do not remember how it works.
Maybe you can look at the source code and figure it out, and write up some improved documentation for us? On 3/21/17, John P. Rouillard <rouilj+fos...@cs.umb.edu> wrote: > > Hi Everybody: > > I am currently using a child project/repository as described > in: > > http://www.fossil-scm.org/index.html/doc/trunk/www/childprojects.wiki > > In this child repo I have files that should not be pushed to > the main repo. So my locally added files, configuration file > changes etc. all happily live in the child repo. > > However when I do a: > > fossil pull --from-parent-project > > I usually end up forking the trunk which requires a merge to > get things back in order. Is that how this is supposed to > work? I was envisioning the parent project would be > something more like a branch that I could merge/integrate > from at will. Should I change the child project's > main-branch from "trunk" to "mainline" to reserve the trunk > tag for the parent project. > > If I should rename to mainline, I have a bunch of commits in > the repo. So how do I move all the child's trunk commits to > the new mainline branch and establish the mainline branch > going forward? > > Also I would like to use fossil as the method people use to > manage the software at their own sites, so understanding how > to use the child project feature effectively is a big win. > > Thanks for any ideas on how to use this feature successfully. > > -- > -- rouilj > John Rouillard > =========================================================================== > My employers don't acknowledge my existence much less my opinions. > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > -- 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
