monotone

monotone Mtn Source Tree

Root/botan/README.botan-monotone

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

Archive Download this file

Branches

Tags

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