launchpad-dev team mailing list archive

[Max Kanat-Alexander <mkanat@xxxxxxxxxxxx>]

On 01/27/2011 03:34 PM, John Arbash Meinel wrote:
> inventory.pt on pqm has a link to /view
> inventory.pt on trunk only has a link to /raw

	Oh, you mean for the paper icon? Yes, that is a change made on trunk.
That icon should be commented-out for launchpad, but should still work
like it does on trunk.

> Any given conflict was resolved in favor of /trunk as far as made sense.
> There weren't many.

	There shouldn't have been any "as far as made sense"--everything should
have been resolved toward trunk without exception. trunk is a later
edition of pqm, there should be no pqm-specific changes other than
backports from trunk.

	If you then wanted to customize pqm to remove /raw, that should
probably be done in a separate commit after the initial merge. (Just
comment it out the controller map and comment-out those template lines.)

	-Max
-- 
http://www.bugzillasource.com/
Competent, Friendly Bugzilla, Perl, and IT Services