Em Sexta-feira, 12 de Novembro de 2010, às 11:56:30, Oswald Buddenhagen escreveu: > On Thu, Nov 11, 2010 at 09:44:20PM +0100, Macieira Thiago (Nokia-MS-Qt/Oslo) wrote: > > On Thursday, 11 de November de 2010 20:51:27 Oswald Buddenhagen wrote: > > > > Not really. One merge is enough. > > > > > > no, it's not, because mainline will have progressed because of other > > > integrations. > > > > [...] > > If the merge fails, the requestor will merge C7 to F3 (exactly what the > > server tried) and fix the conflicts, creating M2. Then he submits M2 for > > integration. But at that time, mainline will have progressed to C8, so a > > new merge is required. > > > > I don't call this merge spamming, it is the proper way to do things. > > it is *exactly* the same as using pull instead of pull --rebase after > doing your two whimsy commits. it's a *superfluous* merge, as opposed to > the "proper" merges from and to mainline. i don't see why we should > exclude merge commits from the "avoid unnecessary merges" rule if we can > do better with rather little effort.
The difference is that there's no safe way of doing what you ask automatically.
Look back at my example:
... C1---C2---C3---C4---C5---C6---C7 [mainline]
\ \
\-F1---F2-+-M1---F3 [feature]
This is what was submitted and the CI rejected because C7 and F3 didn't merge
cleanly without human intervention. How do you solve this?
By merging with human intervention, who will fix the conflicts.
The whole point here is that F1, F2 and F3 are more than one commit each --
think in the order of a hundred, even if M1 only happened once. So this branch
simply can't be rebased, which in turn means that there's no way that we can
automate the merge conflict resolution.
I don't think you've tried to get a reasonable diff from a merge commit...
--
Thiago Macieira - thiago.macieira (AT) nokia.com
Senior Product Manager - Nokia, Qt Development Frameworks
Sandakerveien 116, NO-0402 Oslo, Norway
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Opengov mailing list Opengov@qt-labs.org http://lists.qt-labs.org/listinfo/opengov
