I find that forks are surprisingly disconcerting to casual users of fossil. A common scenario is that a fork occurs and then developers spin their wheels in silly "I already committed this!" "But I did and update and I don't see your changes!" cycles. As Richard has pointed out wise developers who maintain "situational awareness" by checking the timeline regularly are only trivially affected by forks.
I have a suggestion that might make life easier for the casual fossil user. On detection of a fork it would be nice if fossil prompted the user to either "automerge" or "autobranch". In automerge fossil would do a merge and if there are no conflicts automatically commit with a comment "automerged fork". In autobranch fossil would simply name one side of the fork. Note also that if you detect a fork it is important to do a "fossil update trunk" (assuming the fork is on the trunk) before merging. Otherwise your current node may not be the latest. Update without the branch name seems to not try to move to the latest node. On Wed, Jul 9, 2014 at 9:48 PM, Andy Bradford <amb-fos...@bradfords.org> wrote: > Thus said Andy Goth on Wed, 09 Jul 2014 18:49:45 -0500: > > > What's going on here? Everything is tagged trunk, yet [b4a53ba45f] is > > displayed as if on a branch. Was there a fork or something? > > As Richard already explained it was a fork. For a good explanation of a > fork (which is really just like a branch but usually not intentional, > but sometimes it might be), see: > > http://fossil-scm.org/index.html/doc/trunk/www/branching.wiki > > Andy > -- > TAI64 timestamp: 4000000053be1b43 > > > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > -- Matt -=- 90% of the nations wealth is held by 2% of the people. Bummer to be in the majority...
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
