monotone

monotone Mtn Source Tree

Root/botan/README.botan-monotone

1This botan/ subdirectory is maintained in a separate staging branch,
2currentnly named au.asn.ucc.matt.botan.monotone-2, and available for
3download from nabagan.bluegap.ch. This avoids pulling the entire
4net.randombit.botan history into net.venge.monotone. It also evades the
5issue of being unable to resurrect files (a problem of die-die-die merge),
6as unwanted files are just moved into a.a.u.m.b.monotone-2's Attic/
7directory.
8
9Steps to update net.venge.monotone.botan with net.randombit.net:
10
111) "mtn pull randombit.net net.randombit.botan"
12
132) "mtn propagate net.randombit.botan au.asn.ucc.matt.botan.monotone-2"
14
153) "mtn up" in an a.a.u.m.b.monotone-2 workspace.
16 In a n.v.m.botan botan/ dir, do "rm *".
17 Then copy the entire contents (no subdirs though) from the staging
18 branch's root dir to the botan/ dir.
19
204) "mtn ls unknown botan/" and "mtn ls missing botan/" in n.v.m.botan. If
21 there are obviously renamed files, use "mtn rename" to fix them.
22 Otherwise add/drop files as appropriate. Also fix up Makefile.am.
23
244) make check in n.v.m.botan. If it succeeds, commit. If there are problems,
25 copy the changes back to the staging branch and commit there as well. You
26 might need to move some files from Attic/src/ to / in the staging branch.
27
28Update this file if things don't work, and remember to push the staging branch
29to venge.net.

Archive Download this file

Branches

Tags

Quick Links:     www.monotone.ca    -     Downloads    -     Documentation    -     Wiki    -     Code Forge    -     Build Status