Merge lp:~abentley/launchpad/db-devel-criss-cross into lp:launchpad/db-devel

[Aaron Bentley]

Manually merge stable.

= Summary =
Fix criss-cross merge

== Proposed fix ==
Manually merge stable into db-devel using the LCA merge algorithm

== Pre-implementation notes ==
None

== LOC Rationale ==
Not applicable; all the code in stable should already have a LOC rationale.

== Implementation details ==
bzr merge --lca

== Tests ==
None

== Demo and Q/A ==
None

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/code/javascript/branchmergeproposal.nominate.js
  lib/canonical/launchpad/icing/css/forms.css
  lib/lp/registry/javascript/sharing/sharingdetailsview.js
  lib/lp/registry/javascript/sharing/tests/test_granteepicker.js
  lib/lp/app/javascript/confirmationoverlay/confirmationoverlay.js
  lib/lp/registry/javascript/sharing/pillarsharingview.js
  lib/lp/bugs/javascript/filebug_dupefinder.js
  lib/lp/registry/services/tests/test_sharingservice.py
  lib/lp/bugs/javascript/subscription.js
  lib/lp/registry/javascript/sharing/tests/test_pillarsharingview.js
  lib/lp/app/javascript/tests/test_multicheckboxwidget.html
  lib/lp/registry/interfaces/product.py
  lib/lp/app/javascript/multicheckbox.js
  lib/lp/registry/javascript/distroseries/differences.js
  lib/lp/registry/javascript/sharing/granteepicker.js
  lib/lp/bugs/javascript/bug_subscription_portlet.js
  lib/lp/bugs/javascript/bugtask_index.js
  lib/lp/registry/interfaces/distribution.py
  lib/lp/registry/services/sharingservice.py
  lib/lp/registry/javascript/distroseriesdifferences_details.js
  lib/lp/registry/model/product.py
  lib/lp/code/javascript/branch.subscription.js
  lib/lp/registry/javascript/tests/test_structural_subscription.js
  lib/lp/registry/tests/test_distribution.py
  lib/lp/translations/javascript/sourcepackage_sharing_details.js
  lib/lp/app/javascript/tests/test_multicheckboxwidget.js
  lib/lp/registry/javascript/structural-subscription.js
  lib/lp/registry/interfaces/sharingservice.py
  lib/lp/bugs/javascript/information_type_choice.js
  lib/lp/registry/model/distribution.py
  lib/lp/registry/tests/test_product.py

./lib/canonical/launchpad/icing/css/forms.css
      85: Invalid value for "CSS Box Module Level 3/CSS Level 2.1" property: -moz-scrollbars-vertical: overflow
     145: Invalid value for "CSS Level 2.1" property: 1em 0 inherit inherit: margin
     248: Line exceeds 80 characters.
     270: Line has trailing whitespace.
     438: Line exceeds 80 characters.
     439: Line exceeds 80 characters.
       4: I003: To few newlines before selectors.
       7: I003: To few newlines before selectors.
       7: I004: Selector must be on a new line.
      10: I003: To few newlines before selectors.
      13: I003: To few newlines before selectors.
      16: I003: To few newlines before selectors.
      19: I003: To few newlines before selectors.
      22: I003: To few newlines before selectors.
      27: I003: To few newlines before selectors.
      30: I003: To few newlines before selectors.
      33: I003: To few newlines before selectors.
      36: I003: To few newlines before selectors.
      39: I003: To few newlines before selectors.
      42: I003: To few newlines before selectors.
      48: I003: To few newlines before selectors.
      51: I003: To few newlines before selectors.
      58: I003: To few newlines before selectors.
      59: I013: Last selector must be followed by " {".
      62: I003: To few newlines before selectors.
      65: I014: Rule declarations should end indented on a single new line.
      65: I003: To few newlines before selectors.
      65: I004: Selector must be on a new line.
      68: I003: To few newlines before selectors.
      71: I003: To few newlines before selectors.
      76: I003: To few newlines before selectors.
      79: I003: To few newlines before selectors.
      87: I003: To few newlines before selectors.
      93: I003: To few newlines before selectors.
      97: I003: To few newlines before selectors.
     100: I003: To few newlines before selectors.
     101: I008: Each declaration must be indented with 4 spaces.
     118: I003: To few newlines before selectors.
     122: I003: To few newlines before selectors.
     123: I008: Each declaration must be indented with 4 spaces.
     128: I003: To few newlines before selectors.
     132: I003: To few newlines before selectors.
     136: I003: To few newlines before selectors.
     142: I003: To few newlines before selectors.
     142: I004: Selector must be on a new line.
     148: I003: To few newlines before selectors.
     151: I003: To few newlines before selectors.
     151: I004: Selector must be on a new line.
     156: I003: To few newlines before selectors.
     159: I014: Rule declarations should end indented on a single new line.
     160: I003: To few newlines before selectors.
     163: I003: To few newlines before selectors.
     167: I003: To few newlines before selectors.
     170: I003: To few newlines before selectors.
     174: I003: To few newlines before selectors.
     175: I008: Each declaration must be indented with 4 spaces.
     181: I003: To few newlines before selectors.
     183: I014: Rule declarations should end indented on a single new line.
     184: I003: To few newlines before selectors.
     187: I003: To few newlines before selectors.
     190: I003: To few newlines before selectors.
     193: I003: To few newlines before selectors.
     196: I003: To few newlines before selectors.
     196: I004: Selector must be on a new line.
     199: I003: To few newlines before selectors.
     202: I003: To few newlines before selectors.
     206: I003: To few newlines before selectors.
     210: I003: To few newlines before selectors.
     216: I003: To few newlines before selectors.
     219: I003: To few newlines before selectors.
     222: I003: To few newlines before selectors.
     224: I014: Rule declarations should end indented on a single new line.
     225: I003: To few newlines before selectors.
     228: I003: To few newlines before selectors.
     233: I003: To few newlines before selectors.
     240: I003: To few newlines before selectors.
     243: I003: To few newlines before selectors.
     246: I003: To few newlines before selectors.
     251: I003: To few newlines before selectors.
     252: I008: Each declaration must be indented with 4 spaces.
     257: I003: To few newlines before selectors.
     270: I003: To few newlines before selectors.
     276: I003: To few newlines before selectors.
     279: I003: To few newlines before selectors.
     282: I003: To few newlines before selectors.
     285: I003: To few newlines before selectors.
     288: I003: To few newlines before selectors.
     294: I003: To few newlines before selectors.
     294: I004: Selector must be on a new line.
     294: I004: Selector must be on a new line.
     302: I003: To few newlines before selectors.
     302: I004: Selector must be on a new line.
     308: I003: To few newlines before selectors.
     312: I003: To few newlines before selectors.
     315: I003: To few newlines before selectors.
     319: I003: To few newlines before selectors.
     322: I003: To few newlines before selectors.
     327: I003: To few newlines before selectors.
     330: I003: To few newlines before selectors.
     333: I003: To few newlines before selectors.
     338: I003: To few newlines before selectors.
     341: I003: To few newlines before selectors.
     347: I003: To few newlines before selectors.
     348: I008: Each declaration must be indented with 4 spaces.
     352: I003: To few newlines before selectors.
     357: I003: To few newlines before selectors.
     364: I003: To few newlines before selectors.
     367: I003: To few newlines before selectors.
     372: I003: To few newlines before selectors.
     378: I003: To few newlines before selectors.
     386: I003: To few newlines before selectors.
     389: I003: To few newlines before selectors.
     393: I003: To few newlines before selectors.
     398: I003: To few newlines before selectors.
     406: I002: To many newlines before selectors.
     413: I003: To few newlines before selectors.
     418: I003: To few newlines before selectors.
     422: I003: To few newlines before selectors.
     426: I003: To few newlines before selectors.
     430: I003: To few newlines before selectors.
     444: I003: To few newlines before selectors.
     449: I003: To few newlines before selectors.
     454: I003: To few newlines before selectors.
./lib/lp/registry/javascript/sharing/tests/test_pillarsharingview.js
      58: Unexpected ','.

[Aaron Bentley (abentley)]

review: Approve