# # patch "ChangeLog" # from [4efd9cfe3cafea37b21a93f2462adcf553b8cc73] # to [df85b3d139823509169ab3843bb32d7a9dfe6e51] # # patch "monotone.texi" # from [57f3c8b8f8d59c873c5908a264328cc73923f9ca] # to [c11e30926fcaf2097e4c6274a159284d786855ea] # =============================================== --- ChangeLog 4efd9cfe3cafea37b21a93f2462adcf553b8cc73 +++ ChangeLog df85b3d139823509169ab3843bb32d7a9dfe6e51 @@ -1,3 +1,7 @@ +2005-07-22 Nathaniel Smith + + * monotone.texi (Committing Work): Remove discussion of manifests. + 2005-07-20 Nathaniel Smith * netsync.cc (rebuild_merkle_trees): Make 'including branch' =============================================== --- monotone.texi 57f3c8b8f8d59c873c5908a264328cc73923f9ca +++ monotone.texi c11e30926fcaf2097e4c6274a159284d786855ea @@ -1467,42 +1467,20 @@ @end group @end smallexample -Monotone did a number of things when committing the new -revision. First, we can see from the output that monotone generated a -manifest of the tree Jim committed. The manifest is stored inside the -database, but Jim can print it out if he wants to see the exact state -of all the files referenced by the revision he committed: +When monotone committed Jim's revision, erased the @file{MT/work} file, +and wrote a new file called @file{MT/revision}, which contains the +working copy's new base revision ID. Jim can use this revision ID in the +future, as an argument to the @command{checkout} command, if he wishes +to return to this revision: @smallexample @group -$ monotone cat manifest -3b12b2d0b31439bd50976633db1895cff8b19da0 include/jb.h -2650ffc660dd00a08b659b883b65a060cac7e560 src/apple.c -e8f147e5b4d5667f3228b7bba1c5c1e639f5db9f src/banana.c address@hidden group address@hidden smallexample - -The column on the left contains cryptographic hashes of the files -listed in the column on the right. Such a hash is also called the -``file ID'' of the file. The file ID identifies the state of each file -stored in Jim's tree. The manifest is just a plain text file, -identical to the output from the popular @command{sha1sum} unix -command. - -When monotone committed Jim's revision, it also erased the address@hidden/work} file, and wrote a new file called @file{MT/revision}, -which contains the working copy's new base revision ID. Jim can use -this revision ID in the future, as an argument to the address@hidden command, if he wishes to return to this revision: - address@hidden address@hidden $ cat MT/revision 2e24d49a48adf9acf3a1b6391a080008cbef9c21 @end group @end smallexample -Finally, monotone also generated a number of certificates, attached to +Monotone also generated a number of certificates, attached to the new revision. These certs store metadata about the commit. Jim can ask monotone for a list of certs on this revision.