Ron W <ronw.m...@gmail.com> writes: > Reading more about bundles, they appear, in Fossil terms, to be what would > be sent out by a push, or similar to an incremental export (yes, Fossil > supports incremental exports).
Hmm, can you tell me more about incremental exports? Iirc, using incremental import from Git was mentioned by some as not 100% reliable which would make 2-way sync with Git pretty simple. > I think your definition of "creating conflicts" is too narrow. If the both > the sending and receiving repos contain a commit to the same parent, there > will be a fork. Merging the fork could require resolving conflicts, no > different from resolving conflicts from applying a patch. You're right. Maybe I'm still spoiled by Darcs which was shining in this regard. > While applying a bundle seems to be a little easier than applying a patch, > bundles still need to be created, applied and reviewed. Correct. > So, if I were to receive a bundle from a non-core contributor, I would > treat it the same as pulling it directly from her/his repo: Clone my repo, > apply the bundle to the clone, then review and "import" changes by diffing > between the clone's workspace and my main repo's workspace. Maybe the possible difference is in the last step. With Git one can do the same, but "import" step is fairly easy if the pull request was rebased on master. > Maybe hg/git/bzr/other have mechanisms to automate what I just described. I > have not had a need to use such mechanisms so have not researched them.* I > am expressing a high level strategy for how I would approach the problem. OK. Fair-enough. Maybe I should just learn to live with Fossil's design decisions in order to enjoy its simplicity. ;) However, I still believe that providing more 'sugar' in the workflow, it could become more attractive to many projects not really neeeding Git(hub). Sincerely, Gour -- Many, many births both you and I have passed. I can remember all of them, but you cannot, O subduer of the enemy! _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
