Merge lp:~julian-edwards/launchpad/fix-popup-help-bug-782224 into lp:launchpad

Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: no longer in the source branch.
Merged at revision: 13103
Proposed branch: lp:~julian-edwards/launchpad/fix-popup-help-bug-782224
Merge into: lp:launchpad
Diff against target: 101 lines (+62/-21)
1 file modified
lib/lp/soyuz/help/derived-series-syncing.html (+62/-21)
To merge this branch: bzr merge lp:~julian-edwards/launchpad/fix-popup-help-bug-782224
Reviewer Review Type Date Requested Status
Julian Edwards (community) code Approve
Matthew Revell (community) text Approve
Review via email: mp+61960@code.launchpad.net

Commit message

[r=julian-edwards][bug=782224] Add real help text for the help pop-up on the new +localpackagediffs page.

Description of the change

This branch adds real help text for the help pop-up on the new +localpackagediffs page. It's mostly self explanatory. To see the old text, go here:

https://dogfood.launchpad.net/ubuntu/oneiric/+localpackagediffs

And click " (Read more about syncing from a parent series)."

To post a comment you must log in.
Revision history for this message
Matthew Revell (matthew.revell) wrote :

Looks good to me. Thanks for doing this Julian.

review: Approve (test)
Revision history for this message
Matthew Revell (matthew.revell) :
review: Approve (text)
Revision history for this message
Julian Edwards (julian-edwards) wrote :

There is no code but lp-land wants a code review.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/soyuz/help/derived-series-syncing.html'
--- lib/lp/soyuz/help/derived-series-syncing.html 2010-09-07 07:30:42 +0000
+++ lib/lp/soyuz/help/derived-series-syncing.html 2011-05-23 15:59:30 +0000
@@ -12,35 +12,76 @@
12 <h1>Syncing software from a parent series</h1>12 <h1>Syncing software from a parent series</h1>
1313
14 <p>14 <p>
15 A nice introduction text written by the great15 Syncing software from a parent series will take the package that's
16 currently published in it, and upload it to the derived series without
17 you having to use command line tools such as <em>dput</em> or
18 <em>ftp</em>.
16 </p>19 </p>
1720
18 <p>21 <p>
19 <strong>Important:</strong> Syncing a package from the parent22 <strong>Important:</strong> Syncing a package from the parent
20 series will overwrite ....23 series will supersede any changes made in the derived version. If there
24 are local changes you don't wish to lose, you will need to manually
25 merge the changes into the upstream package and upload that to the
26 derived series.
21 </p>27 </p>
2228
23 <h2>Checking the differences</h2>29 <h2>Checking the differences</h2>
2430
25 <p>31 <p>
26 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do32 Each row in the table shows a package that has different versions in
27 eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim33 the derived series and the parent(s). Clicking the package name
28 ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut34 will expand the row to show more details about the package and allow
29 aliquip ex ea commodo consequat. Duis aute irure dolor in35 you to take some actions:
30 reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla36 <ul>
31 pariatur. Excepteur sint occaecat cupidatat non proident, sunt in37 <li>Add a comment about this package.</li>
32 culpa qui officia deserunt mollit anim id est laborum.38 <li>Request debdiffs</li>
33 </p>39 <li>Ignoring this difference, or all differences for this package</li>
3440 </ul>
35 <p>41 </p>
36 <strong>Step 1:</strong>42
37 Sed ut perspiciatis unde omnis iste natus error sit voluptatem43 <h3>Adding comments</h3>
38 accusantium doloremque laudantium, totam rem aperiam, eaque ipsa44 <p>
39 quae ab illo inventore veritatis et quasi architecto beatae vitae45 Click the green "Add comment" button and enter the comment inline.
40 dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit46 All previous comments are shown here also.
41 aspernatur aut odit aut fugit, sed quia consequuntur magni dolores47 </p>
42 eos qui ratione voluptatem sequi nesciunt.48
43 </p>49 <h3>Requesting debdiffs</h3>
4450 <p>
51 Click the "Compute differences from last common version". A request is
52 sent to the server to initiate the debdiff calculation. While you wait
53 for the calculation the icon will flash. The page will update
54 automatically when the debdiff becomes available, giving you a link to
55 download the debdiff file.
56 </p>
57
58 <h3>Ignoring differences</h3>
59 <p>
60 If you don't care about this package you have the option of setting it to
61 <em>ignored</em>, which means that it will no longer appear in the list.
62 You can choose to ignore just "These versions", which means if a new
63 version is uploaded it will re-appear, or "All Versions" which means
64 you won't see it again unless you search explicitly for ignored
65 packages in the search criteria at the top of the page.
66 </p>
67
68 <h2>Requesting a sync</h2>
69 <p>
70 There are two methods of syncing:
71 <ul>
72 <li><strong>A mass-sync:</strong> This grabs all packages in all
73 parents that have a higher version and uploads them to the
74 derived series by clicking the mass-sync button at the bottom
75 of the page. To do this you need to have archive administrator
76 permissions.</li>
77 <li><strong>A selective sync:</strong> You can check the box next
78 to each package and then click the sync button at the bottom of
79 the page. To do this you need to have permissions to upload
80 each package.</li>
81 </ul>
82 After you request a sync the operation will complete in the background
83 and the package(s) will flow into the distribution just like a normal
84 upload, including being held in the upload queue as appropriate.
85 </p>
45 </body>86 </body>
46</html>87</html>