On Wed, Apr 8, 2015 at 6:16 AM, Richard Hipp <d...@sqlite.org> wrote:
> On 4/8/15, Matt Welland <mattrwell...@gmail.com> wrote: > > Today I got to hear from a team that had a very near serious QA escape > due > > to an undetected fork. > > Can you provide more detail on this incident so that I can better > understand what Fossil can do to help prevent a recurrence? > The problem: What we are seeing is that forks happen due to simultaneous, partially overlapping, commits and that neither party involved in the two commits has any idea that a fork was committed. Fossil sometimes doesn't give the "multiple descendents" message and so a fork can go undetected in the timeline. In the case in question a critical change was committed but it ended up being isolated on the tip of a fork and was lost in the hundreds of subsequent commits. Luckily a QA check caught the issue but only very late in the game and there was quite a scramble to recover. Needless to say this upset quite a few people. The picture below is of a fork that happened a few days ago in one of our busiest repos where we are seeing as much as several forks a week. Most devs using that repo are now being vigilant and fixing the forks as they happen but this is an annoying distraction from getting real work done. BTW, we've had a few cases of committing of a fork fix create another fork. [image: Inline image 1] A case of fixing a fork creating a new fork: [image: Inline image 2] Possible solutions: 1. Aggressive notification of existing forks on running any of; update, sync, pull, push, commit, checkout, or status. 2. Improved on sync detection during commit (the git model of blocking forks or similar). 3. Add a setting controlled server mode where the commit process gets a server-side lock to serialize commits. > -- > 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