launchpad-dev team mailing list archive

[John Arbash Meinel <john@xxxxxxxxxxxxxxxxx>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 1/27/2011 5:21 PM, Max Kanat-Alexander wrote:
> On 01/27/2011 02:46 PM, John Arbash Meinel wrote:
>>  a) In 'inventory.pt' you deleted the /annotate link, while in pqm it
>>     was the /view link. I presume this was in favor of the /raw link.
>>     I went ahead and left both /view and /raw, though from the
>>     discussion I've followed, it sounds like we want to use /view.
> 
> 	No, /view and /raw are totally unrelated. There is no either-or
> situation anywhere. I think the difference you're seeing is that I
> backported several things to the pqm branch that were also on trunk.

inventory.pt on pqm has a link to /view
inventory.pt on trunk only has a link to /raw

I'm pretty sure that makes them related.

> 
> 	You probably shouldn't be merging trunk *into* the pqm branch, you
> should probably just be replacing the pqm branch with trunk--or at
> least, resolving all conflicts in favor of trunk--unless the pqm branch
> has differences against stable other than my backports.

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

> 
>>     This means that the formatting on the Inventory page is a little
>>     bit off. Presumably because of extra links that aren't accounted
>>     for in the css. (See attached screenshot)
> 
> 	trunk doesn't look like that, so that would be an error in your merge.
> 
> 	-Max

Right, I assume it is explicitly because I included both /view and /raw
into the page. It is easy enough to remove one. But given the
discussions "we don't want /raw on Launchpad", it seemed reasonable to
actually resolve that in favor of pqm. Since it wasn't clear cut either
way, I punted and left them both for now, with a clear comment about
where we might want to look.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1CAR4ACgkQJdeBCYSNAANFiACdFYzd47K13EUYg0Q/MSAj2zZA
dmIAn14B3jExwHfrBZfzqxDpYyHppQM1
=YWEw
-----END PGP SIGNATURE-----