← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~nigelbabu/launchpad/645825-ui-example into lp:launchpad

 

Nigel Babu has proposed merging lp:~nigelbabu/launchpad/645825-ui-example into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #645825 in Launchpad itself: ""bzr push" examples in UI say to push to trunk"
  https://bugs.launchpad.net/launchpad/+bug/645825

For more details, see:
https://code.launchpad.net/~nigelbabu/launchpad/645825-ui-example/+merge/61175

The pages that show, or let me choose, the branch for a productseries tell me I can create the branch with "bzr push." They give a full example command line with the right product name, but the productseries name always seems to be "trunk" rather than the name of the series I'm actually trying to set a branch for.  Fixed the hardcoded trunk with name of the series.
-- 
https://code.launchpad.net/~nigelbabu/launchpad/645825-ui-example/+merge/61175
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~nigelbabu/launchpad/645825-ui-example into lp:launchpad.
=== modified file 'lib/lp/registry/templates/productseries-codesummary.pt'
--- lib/lp/registry/templates/productseries-codesummary.pt	2011-01-17 21:03:16 +0000
+++ lib/lp/registry/templates/productseries-codesummary.pt	2011-05-16 21:06:34 +0000
@@ -41,7 +41,7 @@
             <li id="ssh-key-directions">
               Push the branch directly to Launchpad, e.g. with:<br />
               <tt><strong>
-                bzr push lp:~<tal:user replace="view/user/name"/>/<tal:project replace="context/product/name"/>/trunk
+                bzr push lp:~<tal:user replace="view/user/name"/>/<tal:products replace="context/product/name"/>/<tal:series replace="context/name"/>
               </strong></tt>
               <tal:no-keys condition="not:view/user/sshkeys">
                 <br/>To authenticate with the Launchpad branch upload service,

=== modified file 'lib/lp/registry/templates/productseries-linkbranch.pt'
--- lib/lp/registry/templates/productseries-linkbranch.pt	2011-01-17 20:39:15 +0000
+++ lib/lp/registry/templates/productseries-linkbranch.pt	2011-05-16 21:06:34 +0000
@@ -28,7 +28,7 @@
             <li id="ssh-key-directions">
               Push the branch directly to Launchpad, e.g. with:<br />
               <tt><strong>
-                bzr push lp:~<tal:user replace="view/user/name"/>/<tal:project replace="context/product/name"/>/trunk
+                bzr push lp:~<tal:user replace="view/user/name"/>/<tal:project replace="context/product/name"/>/<tal:series replace="context/name"/>
               </strong></tt>
               <tal:no-keys condition="not:view/user/sshkeys">
                 <br/>To authenticate with the Launchpad branch upload service,