https://bugzilla.wikimedia.org/show_bug.cgi?id=66683
--- Comment #3 from Bryan Davis <[email protected]> --- (In reply to Tim Landscheidt from comment #2) > Note that deployment-prep is special in its use of role::puppet::self in > that it always uses HEAD (AFAIK). We are actually using a model where we layer pending gerrit patches on top of origin/production via cherry-pick and update by rebasing those local commits on the origin branch. The nice thing about this is that when a commit is actually merged in gerrit the rebase will detect that and discard the local commit in favor of the merged version. The number of pending patches we have at any given time has varied between zero (doesn't happen very often) and nine or ten with four or five being normal. > Typically, there will be local changes and/or bisects, so automatic > updates shouldn't be the default. The model of rebasing against an upstream tracking branch should work for almost anyone, but I agree that automatic updating should be a separate role that each project chooses to apply if we go in that direction. -- You are receiving this mail because: You are the assignee for the bug. You are on the CC list for the bug. _______________________________________________ Wikibugs-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
