# # patch "ChangeLog" # from [80ced1415b0c474e3b82c51b998e96b649c5db75] # to [f2e267d9cddd7fb5917ae5bc045e79f66b71c6c6] # # patch "monotone.texi" # from [7f5cde8667b5c13e8dd4a7c7c9c5127a2eaa87ad] # to [d78e0943f6472cdf45ffe79e195340e2ecf78f7f] # ======================================================================== --- ChangeLog 80ced1415b0c474e3b82c51b998e96b649c5db75 +++ ChangeLog f2e267d9cddd7fb5917ae5bc045e79f66b71c6c6 @@ -1,3 +1,8 @@ +2005-11-14 Nathaniel Smith
+ + * monotone.texi (Historical records): Clarify wording, based on + feedback from Daniel Phillips. + 2005-11-13 Nathaniel Smith * monotone.texi (Automation): Document sort order for 'automate ======================================================================== --- monotone.texi 7f5cde8667b5c13e8dd4a7c7c9c5127a2eaa87ad +++ monotone.texi d78e0943f6472cdf45ffe79e195340e2ecf78f7f @@ -90,7 +90,7 @@ @chapter Concepts This chapter should familiarize you with the concepts, terminology, -and behavior described in the remainder of the user manual. Please +and behavior described in the remainder of the user manual. Please take a moment to read it, as later sections will assume familiarity with these terms. @@ -418,17 +418,20 @@ @image{figures/revision} @end ifnotinfo -The content of a revision makes reference to file IDs, in describing -a changeset, and manifest IDs, in describing tree states ``before and -after'' the changeset. Crucially, revisions also make reference to address@hidden revision IDs}. This fact -- that revisions include the IDs of -other revisions -- causes the set of revisions to join together into a -historical @i{chain of events}, somewhat like a ``linked list''. Each -revision in the chain has a unique ID, which includes @i{by reference} -all the revisions preceeding it. Even if you undo a changeset, and -return to a previously-visited manifest ID during the course of your -edits, each revision will incorporate the ID of its predecessor, thus -forming a new unique ID for each point in history. +The content of a revision includes one or more changesets. These +changesets make reference to file IDs, to describe how the tree changed. +The revision also contains manifest IDs, as another way of describing +the tree ``before and after'' the changeset --- storing this information +in two forms allows monotone to detect any bugs or corrupted data before +they can enter your history. Finally and crucially, revisions also make +reference to @i{other revision IDs}. This fact -- that revisions include +the IDs of other revisions -- causes the set of revisions to join +together into a historical @i{chain of events}, somewhat like a ``linked +list''. Each revision in the chain has a unique ID, which includes address@hidden reference} all the revisions preceeding it. Even if you undo a +changeset, and return to a previously-visited manifest ID during the +course of your edits, each revision will incorporate the ID of its +predecessor, thus forming a new unique ID for each point in history. @ifinfo @smallexample