1 | Importing a new Moira snapshot: |
---|
2 | |
---|
3 | 0) Run "svn up" to ensure your copy of the Athena source is up to date. |
---|
4 | |
---|
5 | 1) In a scratch directory, checkout trunk/moira from the moira repository: |
---|
6 | |
---|
7 | svn co svn+ssh://svn.mit.edu/moira/trunk/moira moira |
---|
8 | |
---|
9 | 2) Make a note of the latest moira revision number (from svn info) |
---|
10 | |
---|
11 | 3) cd to a checkout of trunk/third/moira in the athena repo |
---|
12 | |
---|
13 | 4) Copy the latest moira checkout into your working copy of the athena |
---|
14 | source. You'll need to use something that won't copy over the SVN |
---|
15 | metadata. My preference is for rsync. |
---|
16 | |
---|
17 | ~/src/athena/third/moira$ rsync -avzC /path/to/moira/checkout/ . |
---|
18 | |
---|
19 | Consider adding "-n" to rsync's arguments to try it with a dry-run |
---|
20 | first. |
---|
21 | |
---|
22 | 5) Sanity check the copy to ensure you didn't omit the trailing slash |
---|
23 | and thus copy the moira subdirectory itself, instead of its contents. |
---|
24 | |
---|
25 | 6) Run "svn status" to sanity-check what changed. Add any new files |
---|
26 | as necessary, either manually, or with something like the following: |
---|
27 | |
---|
28 | svn status | awk '/^?/ { print $2; }' | xargs svn add |
---|
29 | |
---|
30 | Also, you'll need to delete any files that no longer exist. One |
---|
31 | way to do this (probably not the best way) is to go back to your |
---|
32 | moira working copy, and do a reverse merge of the previous imported |
---|
33 | revision. For example, if the last snapshot was from moira r3987, |
---|
34 | and the current one is r4042: |
---|
35 | |
---|
36 | ~/scratch/moira$ svn merge -r4042:3987 . |
---|
37 | |
---|
38 | Then run "svn status" and looked for _added_ files (it's a reverse |
---|
39 | merge), and those are the files to delete. Or, comb the moirac |
---|
40 | discuss meeting and look for "Removed:" in the commit messages. Or |
---|
41 | do something else. |
---|
42 | |
---|
43 | 7) Run "svn diff" and skim the changes to make sure they look reasonable. |
---|
44 | |
---|
45 | 8) Edit debian/changelog, and bump the version number, including the |
---|
46 | datestamp and the moira revision number (see step 2). |
---|
47 | |
---|
48 | 9) Commit the change. |
---|
49 | |
---|
50 | 10) Update these directions if anything has changed. |
---|