On Fri, Apr 3, 2015 at 6:11 AM, Richard Hipp <d...@sqlite.org> wrote:
> On 4/3/15, Sean Woods <s...@seanwoods.com> wrote: > > On Fri, Apr 3, 2015, at 08:25 AM, Richard Hipp wrote: > >> On 4/3/15, Sean Woods <s...@seanwoods.com> wrote: > >> > > >> > How can I "merge" both of these "branches" back into one trunk? > >> > >> "fossil merge" (with no arguments) should merge together all forks of > >> the branch you are working on. > > > > Thanks, that fixed it. What is this scenario called? Is it a fork? > > Yes. It happens sometimes, when two separate users try to commit at > the same time. See, for example > (https://www.sqlite.org/src/timeline?c=2015-03-21+12:22:16). It is > harmless. All you have to do is merge the fork back together. > Whist a fork may be harmless to a savvy fossil user they are disconcerting, confusing and problematic for casual users. I request the devs consider implementing something like the following: On "fossil update" check if there are other leaves on the current branch, if so put out a warning and take the user to the tip of the current tine of the fork. The warning should ideally inform the user that there is a fork and they can run "fossil merge" followed by "fossil commit" to correct it. Forks are such a problem for us that one user created an automatic fork detector script that is called when fossil files are touched. If there is a fork it sends email to the people who created it asking them to correct it. If my suggestion above was implemented I think there would be no need for the detector, however I have considered having the detector automatically correct the fork. 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. > -- > 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 >
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
