wjsullivan.net

Overloading the Machine

NotesArch

Notes

To make a mirror:

tla archive-mirror john@wjsullivan.net--2005

To revert changes made locally to hello.c to what's in the archive:

tla file-diff hello.c | patch -R

To revert a mistaken commit (patch-104 for example):

tla replay --reverse mwolson@gnu.org--2006-planner-el/planner-el--devel--0--patch-104
tla commit --out-of-date-ok

To catch up with a main branch (ignore the specifics of the branch name, they are now outdated):

tla star-merge --three-way sacha@free.net.ph--main/planner--dev--1.0
tla log-for-merge >> ++name-of-log-file
Edit the log file, add a summary comment.
tla commit

See http://www.mwolson.org/projects/CooperationAndArch.html for more info.

To show diffs between two revisions:

tla get-changeset patch-3
tla show-changeset --diffs muse--johnsu01--0--patch-3.patches
tla show-changeset --diffs ,,delta.1152811960.17171.1/

Other useful things:

tla logs --summary -A mwolson@gnu.org--2006 planner--main--1.0: Shows the list of patches along with the log summary.
tla get mwolson@gnu.org--2006-planner-el/planner-el--devel--0 planner

So she went into the garden to cut a cabbage leaf to make an apple pie; and at the same time a great she-bear, coming up the street pops its head into the shop. "What! no soap?" So he died, and she very imprudently married the barber; and there were present the Picninnies, and the Grand Panjandrum himself, with the little round button at top, and they all fell to playing the game of catch as catch can, till the gunpowder ran out at the heels of their boots.

-- Samuel Foote