-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 2/2/2011 9:53 AM, Julian Edwards wrote: > On Wednesday 02 February 2011 15:31:42 Jonathan Lange wrote: >> On Wed, Feb 2, 2011 at 3:30 PM, Julian Edwards >> <[email protected]> wrote: >> ... >> >>> While I am on the subject, what the heck is PQM actually doing that takes >>> 30 minutes? Surely it should just be merging the submitted branch into >>> the target and committing it if there are no errors. What else does it >>> need to do? >> >> See RT #41739. > > Thanks. Roll on the new merge infrastructure! > > _______________________________________________ > Mailing list: https://launchpad.net/~launchpad-dev > Post to : [email protected] > Unsubscribe : https://launchpad.net/~launchpad-dev > More help : https://help.launchpad.net/ListHelp >
I posted this to the rt, but I think the primary time is that PQM nukes the whole staging area and redownloads trunk from scratch before each commit. With bzr-2.3 you can now do commits to stacked branches. Which means that you could do something like: # get the latest trunk cd $trunk bzr pull lp:$trunk # create a staging area bzr branch --stacked $trunk $staging cd staging # merge, play, whatever I don't know how this falls into the new merge queue code, vs everything else. But even with the new system, if Tarmac decides to nuke everything before it runs tests, then you'll still want something like this. John =:-> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (Cygwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk1JrrUACgkQJdeBCYSNAAPaqwCgv2ccYl9Vrd9V3yu5PAJIWOt/ BRsAnjZgArVHApL+W7li1eIwP5hazSN4 =rJLc -----END PGP SIGNATURE----- _______________________________________________ Mailing list: https://launchpad.net/~launchpad-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-dev More help : https://help.launchpad.net/ListHelp
