On Tue, Jul 31, 2012 at 09:25:56AM +1000, ext Rohan McGovern wrote: > It looks to me like the 'containers' branch has been used inconsistently > with respect to CI, like somebody fast-forwarded it > from 8141e34280a92088a527e0935765ad8ba8e92be8 to > 7a0b8d580df8d6b0012d11f61299046682f4d18a rather than putting a merge > commit through CI. > correct. it would be a total waste to re-integrate a fast-forward of a dead branch.
> Apparently, doing that will not automatically cause > the staging branch to be updated. > yeah, i always forget. :} > For future reference, whoever is bypassing the CI to change the SHA1 of > a branch should also issue a command like this to update the staging > branch: > > ssh -p 29418 codereview.qt-project.org gerrit staging-rebuild --project > qt/qtbase --branch containers > > , which I have now done, fixing the conflict. > that's slight overkill. when you direct-push to a branch with no activity, you can just direct-push the staging branch as well - you just edit the command line, replacing heads with staging. _______________________________________________ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development