Launchpad itself

Merge lp:~mwhudson/launchpad/show-bzr-push-command-bug-258610 into lp:launchpad

  1. show-bzr-push-command-bug-258610
  2. Merge into devel
Proposed by Michael Hudson-Doyle
Status: Rejected
Rejected by: Michael Hudson-Doyle
Proposed branch: lp:~mwhudson/launchpad/show-bzr-push-command-bug-258610
Merge into: lp:launchpad
Diff against target: 19 lines (+5/-1)
1 file modified
lib/lp/code/templates/branch-management.pt (+5/-1)
To merge this branch: bzr merge lp:~mwhudson/launchpad/show-bzr-push-command-bug-258610
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle Approve
Review via email: mp+21120@code.launchpad.net

Description of the change

This is just a demo :-) (but it might work)

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

This looks great!

review: Approve

Unmerged revisions

10482. By Michael Hudson-Doyle

change the message

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/templates/branch-management.pt'
2--- lib/lp/code/templates/branch-management.pt 2009-09-30 12:14:24 +0000
3+++ lib/lp/code/templates/branch-management.pt 2010-03-11 06:57:23 +0000
4@@ -37,10 +37,14 @@
5
6 <tal:logged-in condition="view/user">
7 <tal:can-upload tal:condition="view/user_can_upload">
8- <dl id="upload-url">
9+ <dl id="upload-url" tal:condition="context/last_mirrored">
10 <dt>Update this branch:</dt>
11 <dd>bzr push <span class="branch-url" tal:content="context/bzr_identity" /></dd>
12 </dl>
13+ <dl id="upload-url" tal:condition="not:context/last_mirrored">
14+ <dt>Create this branch:</dt>
15+ <dd>bzr push --use-existing-dir<span class="branch-url" tal:content="context/bzr_identity" /></dd>
16+ </dl>
17 <p tal:condition="not:view/user/sshkeys" id="ssh-key-directions">
18 To authenticate with the Launchpad branch upload service, you need
19 to <a tal:attributes="href string:${view/user/fmt:url}/+editsshkeys">