Looked again, still can't see a problem. Cheers, Lars
On 9/14/11 10:50 PM, "ext Stephen Kelly" <[email protected]> wrote: >[email protected] wrote: > >> On 9/14/11 10:13 PM, "ext Stephen Kelly" <[email protected]> wrote: >> >>>[email protected] wrote: >>> >>>> The merge will happen tomorrow morning, Oslo time. >>> >>>The refactor branch should be merged again. There is one commit in the >>>refactor branch which is not merged into master, though it has been >>>cherry >>>picked. Tools like gitk then show that refactor has not been merged into >>>master. >> >> I don't see this. Yes we have two merges close to each other, but gitk >> shows the history just fine. >> >> Cheers, >> Lars > >stephen@hal:~/dev/src/qtbase{master}$ git branch --contains >origin/refactor >stephen@hal:~/dev/src/qtbase{master}$ git branch --contains >origin/refactor^ >* master > >Also run gitk origin/refactor and compare the branches metadata for the >branch and the commit before it. > >_______________________________________________ >Qt5-feedback mailing list >[email protected] >http://lists.qt.nokia.com/mailman/listinfo/qt5-feedback _______________________________________________ Qt5-feedback mailing list [email protected] http://lists.qt.nokia.com/mailman/listinfo/qt5-feedback
