On Sat, Apr 18, 2015 at 7:14 AM, Matt Welland <mattrwell...@gmail.com> wrote:
> > For fossil to be a viable long term solution in a intensely busy project I > believe the following is needed: > > 1. The optimal solution, where possible, don't let forks happen at all. > Git does this at a very slight cost to data safety. > 2. Aggressively keep users informed of any open forks in the timeline > 3. No false warnings. > > #1 won't happen due to fossil emphasis on data safety, I believe it *can* > be done for the common use case of an autosync commit. > Fossil tries to prevent forks when auto-sync is on. I don't know if Git has something like auto-sync, but I am aware that many/most projects using Git are configured to reject "non-fast-forward" push/pull. This doesn't actually prevent the fork, only blocks it from appearing in the main repo. (I don't know what happens in a "multi-layer" project where a core dev could receive a commit from downstream then later does a pull from upstream that results in a fork. (This could happen if any core dev makes/receives a commit from the same parent and pushes it upstream right after the first core dev does a pull.)) > #2 is in progress but not aggressive enough to address my concern (thanks > Andy and Jan for your efforts, much appreciated) > This is one of the reasons I suggested auto-tagging the fork with a special tag. Then any command could query the tags table rather than having to do several queries to find the forks. > #3 was looking problematic, possibly due to philosophy trumping > pragmatism? Might be addressed now? > This is a definition problem. To my thinking, any place a parent commit has 2 or more children on the same branch is a fork. This seems very clear and unambiguous to me. Some think this is too aggressive, so I will grant that closing fork-leaves is sufficient to indicate explicit intent to resolve the fork. As to merging, a "branch-leaf" is not automatically closed by merging it to anther branch, so why would merging automatically do anything to a "fork-leaf" to make it not a fork-leaf?
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
