Achim Gratz <strom...@nexgo.de> wrote: > Nick Dokos writes: > > Achim Gratz <strom...@nexgo.de> wrote: > > > >> Nick Dokos writes: > >> > This doesn't make sense (I blame the head-spinning reverts :-) ), so let > >> > me try again: Eric's commit broke it between 7.8.03 and 7.8.04. It got > >> > fixed somehow, either because of a revert or because some fix was > >> > actually applied, I don't know which. It was working until 7.8.10 and > >> > then Bastien's commit reverted to (broken) 7.8.04, so from 7.8.11- on > >> > the breakage exists. > >> > >> What are you talking about? I don't see any revert between 7.8.10 and > >> 7.8.11? You need to be careful with bisecting acroess fixups, you > >> should "skip" such commits (also commits that don't build, etc.). > >> > > > > I may be confused but what I'm talking about is tags on the master > > branch: commit 552b0edb254a104e441e28f3a942dc6005e97f87 came between the > > tags "release_7.8.10" and "release_7.8.11" on the master branch: > > That's a trap: the release tag for 7.8.11 is on the wrong side of the > merge and as a result you're pulling in the complete history of commits > that are in one branch, but not the other and that includes the botched > merge before 7.8.04. > >
OK. Is there no way to fix that? That's pretty confusing. And how can I tell that I have fallen into this trap? Nick
