Re: [Wikitech-l] git bisect and merge commits [Was Re: Bug 37225: Several history entries for the same content and watchlists showing wrong article size changes ]

2012-07-07 Thread Subramanya Sastry
Thanks for the additional explanation, Platonides. git bisect can handle merge commits, but I have run into problems with it -- but it may also have been my weak git-fu. FWIW, I was able to linearize history using git rebase on a local branch -- I had to resolve a couple very minor merge con

Re: [Wikitech-l] git bisect and merge commits [Was Re: Bug 37225: Several history entries for the same content and watchlists showing wrong article size changes ]

2012-07-07 Thread Platonides
The problem is that we can't reproduce it. Otherwise we would have already found the problematic commit (yes, git bisect would be able to). It probably only happens with lagged slaves and many people editing at the same time. I have already studied the commits in that range, but none of them seem

Re: [Wikitech-l] git bisect and merge commits [Was Re: Bug 37225: Several history entries for the same content and watchlists showing wrong article size changes ]

2012-07-07 Thread Antoine Musso
Subramanya Sastry wrote: > > But, git bisect will work best with a linear commit history, and it is > not going to really work well with the current totally non-linear commit > history on core. So, one very good reason to examine how to minimize > merge commits with gerrit. I would have to caref

[Wikitech-l] git bisect and merge commits [Was Re: Bug 37225: Several history entries for the same content and watchlists showing wrong article size changes ]

2012-07-07 Thread Subramanya Sastry
I think one area where a broad search could be helpful is narrowing down when this first started happening, and narrowing down which deployment must have been the issue. Since we're on a biweekly cycle, it shouldn't be a huge amount of code that contributes to this bug. For example, someone wit