On Mon, 2010-01-25 at 18:14 +0000, José Fonseca wrote: > > But automated infrastructures aside, my worry with reviewing merges is > the actual constraints that git has. For example, let's suppose the > following scenario: > > 1) Developer A merges a stable branch into master. > 2) After spending a bunch of time fixing conflicts the best he can, he > emails the patch to mesa3d-dev for peer review. > 3) Developer B checks in a change into master. > 4) Developer A takes feedback from list, updates the code, and commits. > 5) Developer A cannot push because remote head has moved. > > So what can Developer A do now? > > a) Redo the merge, using the new master head.
FWIW, having rerere.enabled set in the Git configuration (see the git-rerere manpage) should help somewhat with this - at least Developer A shouldn't need to resolve the same conflicts over and over again. > b) Rebase the merge on top of the new head (I'm not sure it works, or > that it preserves branch history) Probably not, IME merge commits lose their merge characteristics on modification. > c) Double merge, i.e., merge its local head with the new master head. Which would be mostly a cosmetic problem for the revision history? > Note that this problem is not specific to reviews -- pushing merges can > always lead to this same situation --, but reviews of merges increase > the probability of this problem from unlikely to guaranteed. Agreed, seems like more trouble than it's worth. -- Earthling Michel Dänzer | http://www.vmware.com Libre software enthusiast | Debian, X and DRI developer ------------------------------------------------------------------------------ The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com _______________________________________________ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
