Le 03/04/2013 22:55, Ben Francis a écrit : > On Wed, Apr 3, 2013 at 9:13 PM, Andreas Gal <[email protected]> wrote: > >> What exactly is the problem we are trying to solve here though. How often >> do people still have to double-land themselves? The feedback I was getting >> is that the vast majority of landings is done by our awesome uplifting >> mini-team. In rare instances people have to help directly (thats what we >> should try to reduce by keeping trunk and v1.1 close as long v1.1 is still >> changing). Is this accurate or do you feel that uplifting is still a pain? >> > I suspect you're really asking about gecko here, but I'd like to share an > experience in gaia where the magic of uplifting didn't work so well. > > Bug 836199 was blocked by bug 836647 so bug 836647 was uplifted. But this > patch caused a regression which was later fixed in bug 849280 so that was > uplifted too. But bug 849280 turned out to be subtly dependent on > bug 830644 which wasn't uplifted, thereby causing bug 855021. Bug 855021 > could be fixed by uplifting bug 830644, but that bug has 25+ patches > attached to it, so that wouldn't be very smart. I ended up writing a patch > just for 1.0.1 and 1.1 to stop the dependency madness.
each time we have a conflict, we need to ask: do I need to uplift another bug, or do I need to resolve the conflict ? And that's a quite difficult question to answer indeed : * to uplift another bug, we first need to find it. This goes by blaming + git show + diffing + manually comparing. This is very time consuming * resolving the conflict is probably easier for the dev but in my past experience it seems that most conflicts are actually resolved by uplifting other bugs that were not hard dependencies but rather made the diff different. -- Julien
signature.asc
Description: OpenPGP digital signature
_______________________________________________ dev-b2g mailing list [email protected] https://lists.mozilla.org/listinfo/dev-b2g
