Launchpad itself

Merge lp:~matthew.revell/launchpad/bug-215798 into lp:launchpad

  1. bug-215798
  2. Merge into devel
Proposed by Matthew Revell
Status: Merged
Approved by: Barry Warsaw
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~matthew.revell/launchpad/bug-215798
Merge into: lp:launchpad
Diff against target: 55 lines
2 files modified
lib/lp/code/help/register-branch.html (+38/-0)
lib/lp/code/templates/branch-form-macros.pt (+1/-1)
To merge this branch: bzr merge lp:~matthew.revell/launchpad/bug-215798
Reviewer Review Type Date Requested Status
Barry Warsaw (community) Approve
Review via email: mp+12792@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Matthew Revell (matthew.revell) wrote :

This branch adds a pop-up help links to the "register a branch" page.

The help explains that pre-registering a branch is not necessary and mentions that you must use the "use-existing-dir" option on your first push to the pre-registered branch.

Files touched:

lib/lp/code/help/register-branch.html
lib/lp/code/templates/branch-form-macros.pt

Revision history for this message
Barry Warsaw (barry) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'lib/lp/code/help/register-branch.html'
2--- lib/lp/code/help/register-branch.html 1970-01-01 00:00:00 +0000
3+++ lib/lp/code/help/register-branch.html 2009-10-02 15:46:12 +0000
4@@ -0,0 +1,38 @@
5+<html>
6+ <head>
7+ <title>Uploading a branch without registering</title>
8+ <link rel="stylesheet" type="text/css"
9+ href="/+icing/yui/current/build/cssreset/reset.css" />
10+ <link rel="stylesheet" type="text/css"
11+ href="/+icing/yui/current/build/cssfonts/fonts.css" />
12+ <link rel="stylesheet" type="text/css"
13+ href="/+icing/yui/current/build/cssbase/base.css" />
14+ </head>
15+ <body>
16+ <h1>Uploading a branch without registering</h1>
17+
18+ <p>If you want to host a Bazaar branch on Launchpad, you can push it straight to Launchpad without first registering.</p>
19+
20+ <p>Simply open up your terminal, change to the directory that contains your Bazaar branch and type:</p>
21+
22+ <p>
23+ <code>
24+ bzr launchpad-login userid<br />
25+ bzr push lp:~userid/project-name/branch-name
26+ </code>
27+ </p>
28+
29+ <p>Replace <em>userid</em> with your Launchpad id, <em>project-name</em> with the project's Launchpad id and then chose whichever branch name you want.</p>
30+
31+ <p><a href="https://help.launchpad.net/Code/UploadingABranch" target="_blank">Read more about pushing Bazaar branches to Launchpad &gt;</a></p>
32+
33+ <h2>If you register the branch in Launchpad before pushing to it</h2>
34+
35+ <p>If you register the branch in Launchpad's web interface, before pushing anything to it, you'll need to use a slightly different Bazaar command the first time you push anything to the branch:</p>
36+
37+ <p>
38+ <code>bzr push lp:~userid/project-name/branch-name --use-existing-dir</code>
39+ </p>
40+
41+ </body>
42+</html>
43
44=== modified file 'lib/lp/code/templates/branch-form-macros.pt'
45--- lib/lp/code/templates/branch-form-macros.pt 2009-07-17 17:59:07 +0000
46+++ lib/lp/code/templates/branch-form-macros.pt 2009-10-02 15:46:12 +0000
47@@ -7,7 +7,7 @@
48
49 <div id="branch-unique-name-div" style="display:none">
50 The resulting location of the branch will be:
51- <strong><span id="branch-unique-name"></span></strong>
52+ <strong><span id="branch-unique-name"></span></strong> (<a href="/+help/register-branch.html" target="help">Do you need to register?</a>)
53 </div>
54
55 <div metal:use-macro="context/@@launchpad_form/form">