On Apr 5, 2015 12:13 PM, <to...@acm.org> wrote: > > But, what if the two forks become incompatible when merged? For your proposed auto-merge to work, it’s enough that the two forks simply touch (alter) different files. > > An auto-merge would obviously work without producing conflicts as neither fork touches files touched by the other fork. > > Now, it’s quite possible that either fork which built OK before the merge, no longer does. > > The simplest example is to consider as a sole change the addition of a new file in fork 2 which depends on an external function name called xxx(). Fork 1, however, has just changed that function from xxx() to yyy(). > Neither fork will compile anymore (assuming the new file is now part of the build process). > > It seems that merging can only be done manually, as only a human can know the implications of the changes in the merged files. > > Disclaimer: I may have misunderstood your suggestion.
The auto fork merge is the same as the automatic merge that one of the fork creators would have experienced if they had done their commit a few minutes later. They would have gotten a "fossil would fork" message, done "fossil update" (where the merge happens) and committed. If there is a conflict the auto fork merge would be canceled obviously. Anyhow, it is just my $0.02. The poor handling of symlinks and annoying forks are the two remain things that users gripe about occasionally. Oh, and the two step rm and mv. In a perfect universe Fossil would have a non-distributed mode for those of us trying to use it in a corporate setting and a Unix mode where the constraints of Microsoft Windows could be ignored :) > > From: Matt Welland > It would be very cool if on update if a fork was detected it was (optionally) automerged. If the merge had conflicts then it would be rolled back and the user notified. > Forks in fossil are an artifact of a distributed system trying to pretend it is centralized. Auto fork correction might help maintain the illusion of being centralized. > > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users >
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
