Bazaar

Merge lp:~barry/bzr/migration-docs into lp:bzr/2.0

  1. migration-docs
  2. Merge into 2.0
Proposed by Barry Warsaw
Status: Merged
Merged at revision: not available
Proposed branch: lp:~barry/bzr/migration-docs
Merge into: lp:bzr/2.0
Diff against target: 101 lines
1 file modified
doc/en/upgrade-guide/data_migration.txt (+52/-6)
To merge this branch: bzr merge lp:~barry/bzr/migration-docs
Reviewer Review Type Date Requested Status
Ian Clatworthy Approve
Martin Pool Approve
bzr-core documentation Pending
Review via email: mp+12800@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote :

Updates the migration docs based on my experiences updating ~mailman-coders/mailman/3.0 to 2a format on Launchpad.

Revision history for this message
Martin Pool (mbp) wrote :

> Updates the migration docs based on my experiences updating ~mailman-
> coders/mailman/3.0 to 2a format on Launchpad.

thanks.

this looks reasonable to me, and is basically what I did when upgrading bzr's own branches.

review: Approve
Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

Thanks Barry. That looks good. I'll land it if poolie hasn't already.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/en/upgrade-guide/data_migration.txt'
2--- doc/en/upgrade-guide/data_migration.txt 2009-09-09 13:34:08 +0000
3+++ doc/en/upgrade-guide/data_migration.txt 2009-10-02 18:25:18 +0000
4@@ -30,7 +30,7 @@
5 * **upgrade** - migrate data to a different format.
6
7 **reconcile** is rarely needed but it's good practice to run **check**
8-before and after runing **upgrade**.
9+before and after running **upgrade**.
10
11 For detailed help on these commands, see the `Bazaar User Reference`_.
12
13@@ -40,7 +40,7 @@
14 Communicating with your community
15 ---------------------------------
16
17-To enable a smooth transistion to the new format, you should:
18+To enable a smooth transition to the new format, you should:
19
20 1. Make one person responsible for migrating the trunk.
21
22@@ -97,22 +97,54 @@
23 Migrating branches on Launchpad
24 -------------------------------
25
26+You have two options for upgrading your Launchpad branches. You can either
27+upgrade them remotely or you can upgrade them locally and push the migrated
28+branch to Launchpad. We recommend the latter. Upgrading remotely currently
29+requires a fast, rock solid network connection to the Launchpad servers, and
30+any interruption in that connection can leave you with a partially upgraded
31+branch. The instructions below are the safest and often fastest way to
32+upgrade your Launchpad branches.
33+
34 To allow isolation between public and private branches, Launchpad
35 uses stacked branches rather than shared repositories as the core
36 technology for efficient branch storage. The process for migrating
37 to a new format for projects using Launchpad code hosting is therefore
38 different to migrating a personal or in-house project.
39
40+In Launchpad, a project can define a *development series* and associate a
41+branch with that series. The branch then becomes the *focus of development*
42+and gets special treatment and a shortcut url. By default, if anybody
43+branches your project's focus of development and pushes changes back to
44+Launchpad, their branch will be stacked on your development focus branch.
45+Also, branches can be associated with other Launchpad artifacts such as bugs
46+and merge proposals. All of these things mean that upgrading your focus of
47+development branch is trickier.
48+
49 Here are the steps to follow:
50
51-1. The nominated person grabs a copy of trunk and does the migration.
52+1. The nominated person grabs a copy of trunk and does the migration locally.
53
54 2. On Launchpad, unset the current trunk from being the development focus.
55 (This *must* be done or the following step won't work as expected.)
56
57-3. Push the migrated trunk to Launchpad.
58-
59-4. Set it as the development focus.
60+ 1. Go to your project's home page on Launchpad
61+
62+ 2. Look for "XXX is the current focus of development"
63+
64+ 3. Click on the edit (pencil) icon
65+
66+ 4. Click on "Change details" in the portlet on the right
67+
68+ 5. Scroll down to where it says "Branch: (Optional)"
69+
70+ 6. Blank out this input field and click "Change"
71+
72+3. Push the migrated trunk to Launchpad. See below if you want your
73+ new migrated development focus branch to have the same name as your old
74+ pre-migration development focus branch.
75+
76+4. Set it as the development focus. Follow the instructions above but at step
77+ 5, enter the name of the newly migrated branch you just pushed.
78
79 5. Ask users subscribed to the old trunk to subscribe to the new one.
80
81@@ -124,6 +156,20 @@
82 You are now ready to tell your community that the new trunk is available
83 and to give them instructions on migrating any local branches they have.
84
85+If you want your new migrated development focus branch to have the same name
86+as your old pre-migration branch, you need to do a few extra things before you
87+establish the new development focus.
88+
89+1. Rename your old pre-migration branch; use something like
90+ **foo-obsolete-do-not-use**. You will really not want to delete this
91+ because there will be artifacts (bugs, merge proposals, etc.) associated
92+ with it.
93+
94+2. Rename the new migrated branch to the pre-migration branch's old name.
95+
96+3. Re-establish the development focus branch using the new migrated branch's
97+ new name (i.e. the old pre-migration branch's original name).
98+
99
100 Migrating local branches after a central trunk has migrated
101 -----------------------------------------------------------

Subscribers

People subscribed via source and target branches