\begin{tocenv} \tocitem \@locref{htoc1}{\begin{@norefs}\@print{Chapter 1}\quad{}Introduction\end{@norefs}} \tocitem \@locref{htoc2}{\begin{@norefs}\@print{Chapter 2}\quad{}Installation and Versioning\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc3}{\begin{@norefs}\@print{2.1}\quad{}Building ArX\end{@norefs}} \tocitem \@locref{htoc4}{\begin{@norefs}\@print{2.2}\quad{}Versioning\end{@norefs}} \end{tocenv} \tocitem \@locref{htoc5}{\begin{@norefs}\@print{Chapter 3}\quad{}Setup\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc6}{\begin{@norefs}\@print{3.1}\quad{}IDs\end{@norefs}} \tocitem \@locref{htoc7}{\begin{@norefs}\@print{3.2}\quad{}Archives\end{@norefs}} \end{tocenv} \tocitem \@locref{htoc8}{\begin{@norefs}\@print{Chapter 4}\quad{}Basic Revision Control\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc9}{\begin{@norefs}\@print{4.1}\quad{}\label{sec:The-First-Revision}The First Revision\end{@norefs}} \tocitem \@locref{htoc10}{\begin{@norefs}\@print{4.2}\quad{}Further Revisions\end{@norefs}} \tocitem \@locref{htoc11}{\begin{@norefs}\@print{4.3}\quad{}More complicated changes\end{@norefs}} \tocitem \@locref{htoc12}{\begin{@norefs}\@print{4.4}\quad{}Reviewing your work\end{@norefs}} \tocitem \@locref{htoc13}{\begin{@norefs}\@print{4.5}\quad{}Working with an existing project\end{@norefs}} \end{tocenv} \tocitem \@locref{htoc14}{\begin{@norefs}\@print{Chapter 5}\quad{}Advanced ArX Concepts\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc15}{\begin{@norefs}\@print{5.1}\quad{}\label{sec:Archives}Archives\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc16}{\begin{@norefs}\@print{5.1.1}\quad{}\label{sub:Branches and Revisions}Branches and Revisions\end{@norefs}} \tocitem \@locref{htoc17}{\begin{@norefs}\@print{5.1.2}\quad{}Cached Revisions\end{@norefs}} \tocitem \@locref{htoc18}{\begin{@norefs}\@print{5.1.3}\quad{}Remote Archives\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc19}{\begin{@norefs}\@print{5.1.3.1}\quad{}HTTP with webDAV\end{@norefs}} \tocitem \@locref{htoc20}{\begin{@norefs}\@print{5.1.3.2}\quad{}HTTP with Explicit lists\end{@norefs}} \tocitem \@locref{htoc21}{\begin{@norefs}\@print{5.1.3.3}\quad{}Accessing the Archives\end{@norefs}} \end{tocenv} \tocitem \@locref{htoc22}{\begin{@norefs}\@print{5.1.4}\quad{}\label{sub:Mirrors}Mirrors\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc23}{\begin{@norefs}\@print{5.1.4.1}\quad{}Publishing a local archive\end{@norefs}} \tocitem \@locref{htoc24}{\begin{@norefs}\@print{5.1.4.2}\quad{}Making a local copy of a remote archive\end{@norefs}} \end{tocenv} \end{tocenv} \tocitem \@locref{htoc25}{\begin{@norefs}\@print{5.2}\quad{}\label{sec:Branching-and-Merging}Branching and Merging\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc26}{\begin{@norefs}\@print{5.2.1}\quad{}Initial Branching\end{@norefs}} \tocitem \@locref{htoc27}{\begin{@norefs}\@print{5.2.2}\quad{}Merge\end{@norefs}} \tocitem \@locref{htoc28}{\begin{@norefs}\@print{5.2.3}\quad{}Replay\end{@norefs}} \tocitem \@locref{htoc29}{\begin{@norefs}\@print{5.2.4}\quad{}Merging Back\end{@norefs}} \tocitem \@locref{htoc30}{\begin{@norefs}\@print{5.2.5}\quad{}Bug Fix Branches\end{@norefs}} \end{tocenv} \tocitem \@locref{htoc31}{\begin{@norefs}\@print{5.3}\quad{}Remote Cooperation and Publishing Your Work\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc32}{\begin{@norefs}\@print{5.3.1}\quad{}Tags\label{sub:Tags}\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc33}{\begin{@norefs}\@print{5.3.1.1}\quad{}Release Markers\label{sub:Release-Markers}\end{@norefs}} \tocitem \@locref{htoc34}{\begin{@norefs}\@print{5.3.1.2}\quad{}Collections\end{@norefs}} \tocitem \@locref{htoc35}{\begin{@norefs}\@print{5.3.1.3}\quad{}Floating Tags\end{@norefs}} \tocitem \@locref{htoc36}{\begin{@norefs}\@print{5.3.1.4}\quad{}Limitations\end{@norefs}} \end{tocenv} \tocitem \@locref{htoc37}{\begin{@norefs}\@print{5.3.2}\quad{}export\end{@norefs}} \tocitem \@locref{htoc38}{\begin{@norefs}\@print{5.3.3}\quad{}Applying patches directly\end{@norefs}} \tocitem \@locref{htoc39}{\begin{@norefs}\@print{5.3.4}\quad{}\label{sub:Multiple-commiters-(a}Multiple commiters (a la CVS)\end{@norefs}} \end{tocenv} \tocitem \@locref{htoc40}{\begin{@norefs}\@print{5.4}\quad{}\label{sec:Reverting-development}Reverting development\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc41}{\begin{@norefs}\@print{5.4.1}\quad{}Before you commit\end{@norefs}} \tocitem \@locref{htoc42}{\begin{@norefs}\@print{5.4.2}\quad{}After you commit\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc43}{\begin{@norefs}\@print{5.4.2.1}\quad{}Non-destructive revert\end{@norefs}} \tocitem \@locref{htoc44}{\begin{@norefs}\@print{5.4.2.2}\quad{}Destructive revert\end{@norefs}} \end{tocenv} \end{tocenv} \tocitem \@locref{htoc45}{\begin{@norefs}\@print{5.5}\quad{}Properties\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc46}{\begin{@norefs}\@print{5.5.1}\quad{}Preserving File Permissions\end{@norefs}} \tocitem \@locref{htoc47}{\begin{@norefs}\@print{5.5.2}\quad{}User Defined Properties\end{@norefs}} \tocitem \@locref{htoc48}{\begin{@norefs}\@print{5.5.3}\quad{}End-of-Line Conversion\end{@norefs}} \end{tocenv} \tocitem \@locref{htoc49}{\begin{@norefs}\@print{5.6}\quad{}Hooks\label{sec:Hooks}\end{@norefs}} \tocitem \@locref{htoc50}{\begin{@norefs}\@print{5.7}\quad{}Patch Logs and Changelogs\end{@norefs}} \tocitem \@locref{htoc51}{\begin{@norefs}\@print{5.8}\quad{}Making Patches Bigger or Smaller\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc52}{\begin{@norefs}\@print{5.8.1}\quad{}Selective commits\end{@norefs}} \tocitem \@locref{htoc53}{\begin{@norefs}\@print{5.8.2}\quad{}Breaking up patches\label{sub:Breaking-up-patches}\end{@norefs}} \tocitem \@locref{htoc54}{\begin{@norefs}\@print{5.8.3}\quad{}Agglomerating patches\end{@norefs}} \end{tocenv} \tocitem \@locref{htoc55}{\begin{@norefs}\@print{5.9}\quad{}Working with Large Trees\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc56}{\begin{@norefs}\@print{5.9.1}\quad{}arx edit\end{@norefs}} \tocitem \@locref{htoc57}{\begin{@norefs}\@print{5.9.2}\quad{}\label{sub:link-tree}link-tree\end{@norefs}} \tocitem \@locref{htoc58}{\begin{@norefs}\@print{5.9.3}\quad{}Timestamps\end{@norefs}} \end{tocenv} \tocitem \@locref{htoc59}{\begin{@norefs}\@print{5.10}\quad{}Cryptographic Checksums and Signatures\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc60}{\begin{@norefs}\@print{5.10.1}\quad{}Theory\end{@norefs}} \tocitem \@locref{htoc61}{\begin{@norefs}\@print{5.10.2}\quad{}Practice\end{@norefs}} \end{tocenv} \tocitem \@locref{htoc62}{\begin{@norefs}\@print{5.11}\quad{}Internationalization\end{@norefs}} \tocitem \@locref{htoc63}{\begin{@norefs}\@print{5.12}\quad{}Including one project within another\end{@norefs}} \tocitem \@locref{htoc64}{\begin{@norefs}\@print{5.13}\quad{}Project Tree Inventories\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc65}{\begin{@norefs}\@print{5.13.1}\quad{}\label{sub:Inventory-Tags}Inventory Ids\end{@norefs}} \tocitem \@locref{htoc66}{\begin{@norefs}\@print{5.13.2}\quad{}Inventory Types\end{@norefs}} \end{tocenv} \tocitem \@locref{htoc67}{\begin{@norefs}\@print{5.14}\quad{}\label{sec:Pristine-Trees}Pristine Trees\end{@norefs}} \tocitem \@locref{htoc68}{\begin{@norefs}\@print{5.15}\quad{}Additional Tools\end{@norefs}} \end{tocenv} \tocitem \@locref{htoc69}{\begin{@norefs}\@print{Chapter 6}\quad{}Beyond this manual\end{@norefs}} \tocitem \@locref{htoc70}{\begin{@norefs}\@print{Appendix A}\quad{}Patch Algorithm\end{@norefs}} \tocitem \@locref{htoc71}{\begin{@norefs}\@print{Appendix B}\quad{}Conflicts\label{cha:Conflicts}\end{@norefs}} \tocitem \@locref{htoc72}{\begin{@norefs}\@print{Appendix C}\quad{}Sample Merge Scripts\label{cha:Sample-Merge-Scripts}\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc73}{\begin{@norefs}\@print{C.1}\quad{}Three way merges\label{sec:Three-way-merges}\end{@norefs}} \begin{tocenv} \tocitem \@locref{htoc74}{\begin{@norefs}\@print{C.1.1}\quad{}Meld\end{@norefs}} \tocitem \@locref{htoc75}{\begin{@norefs}\@print{C.1.2}\quad{}Xxdiff\end{@norefs}} \tocitem \@locref{htoc76}{\begin{@norefs}\@print{C.1.3}\quad{}kdiff3\end{@norefs}} \tocitem \@locref{htoc77}{\begin{@norefs}\@print{C.1.4}\quad{}gvimdiff\end{@norefs}} \tocitem \@locref{htoc78}{\begin{@norefs}\@print{C.1.5}\quad{}X/Emacs\end{@norefs}} \end{tocenv} \tocitem \@locref{htoc79}{\begin{@norefs}\@print{C.2}\quad{}Patch merges\label{sec:Patch-merges}\end{@norefs}} \end{tocenv} \end{tocenv}