On Thu, Jul 10, 2014 at 7:12 PM, Matt Welland <estifo...@gmail.com> wrote:
> 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. > FWIW, a bit of trivia: back in 2008 (IIRC) we had an accidental, unnoticed fork or two, one of them being me and Richard a few seconds apart from one another. IIRC (possibly incorrectly) that was what spawned autosync. > 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. > Based on other recent discussions, i think you'll find that "commit before testing" fails a basic sanity check for the majority of the devs. For autobranch, you basically mean what it does now, except that it would pick a new name for the forked one, right? (e.g. username-autofork, or whatever) > 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. > i think(?) that might be because that once the potential fork is detected, sync is stopped. The manual update would not care about a local pending fork. It should work doing "fossil update" without a branch name, though, i think. -- ----- stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal "Freedom is sloppy. But since tyranny's the only guaranteed byproduct of those who insist on a perfect world, freedom will have to do." -- Bigby Wolf
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
