\@addtocsec{htoc}{1}{-1}{\@print{Chapter 1}\quad{}Introduction} \@addtocsec{htoc}{2}{-1}{\@print{Chapter 2}\quad{}Installation and Versioning} \@addtocsec{htoc}{3}{0}{\@print{2.1}\quad{}Building ArX} \@addtocsec{htoc}{4}{0}{\@print{2.2}\quad{}Versioning} \@addtocsec{htoc}{5}{-1}{\@print{Chapter 3}\quad{}Setup} \@addtocsec{htoc}{6}{0}{\@print{3.1}\quad{}IDs} \@addtocsec{htoc}{7}{0}{\@print{3.2}\quad{}Archives} \@addtocsec{htoc}{8}{-1}{\@print{Chapter 4}\quad{}Basic Revision Control} \@addtocsec{htoc}{9}{0}{\@print{4.1}\quad{}\label{sec:The-First-Revision}The First Revision} \newlabel{sec:The-First-Revision}{{4.1}{X}} \@addtocsec{htoc}{10}{0}{\@print{4.2}\quad{}Further Revisions} \@addtocsec{htoc}{11}{0}{\@print{4.3}\quad{}More complicated changes} \@addtocsec{htoc}{12}{0}{\@print{4.4}\quad{}Reviewing your work} \@addtocsec{htoc}{13}{0}{\@print{4.5}\quad{}Working with an existing project} \@addtocsec{htoc}{14}{-1}{\@print{Chapter 5}\quad{}Advanced ArX Concepts} \@addtocsec{htoc}{15}{0}{\@print{5.1}\quad{}\label{sec:Archives}Archives} \newlabel{sec:Archives}{{5.1}{X}} \@addtocsec{htoc}{16}{1}{\@print{5.1.1}\quad{}\label{sub:Branches and Revisions}Branches and Revisions} \newlabel{sub:Branches and Revisions}{{5.1.1}{X}} \@addtocsec{htoc}{17}{1}{\@print{5.1.2}\quad{}Cached Revisions} \@addtocsec{htoc}{18}{1}{\@print{5.1.3}\quad{}Remote Archives} \@addtocsec{htoc}{19}{2}{\@print{5.1.3.1}\quad{}HTTP with webDAV} \@addtocsec{htoc}{20}{2}{\@print{5.1.3.2}\quad{}HTTP with Explicit lists} \@addtocsec{htoc}{21}{2}{\@print{5.1.3.3}\quad{}Accessing the Archives} \@addtocsec{htoc}{22}{1}{\@print{5.1.4}\quad{}\label{sub:Mirrors}Mirrors} \newlabel{sub:Mirrors}{{5.1.4}{X}} \@addtocsec{htoc}{23}{2}{\@print{5.1.4.1}\quad{}Publishing a local archive} \@addtocsec{htoc}{24}{2}{\@print{5.1.4.2}\quad{}Making a local copy of a remote archive} \@addtocsec{htoc}{25}{0}{\@print{5.2}\quad{}\label{sec:Branching-and-Merging}Branching and Merging} \newlabel{sec:Branching-and-Merging}{{5.2}{X}} \@addtocsec{htoc}{26}{1}{\@print{5.2.1}\quad{}Initial Branching} \newlabel{cap:Bob's-original-revisions}{{5.1}{X}} \newlabel{cap:Alice's-branch}{{5.2}{X}} \@addtocsec{htoc}{27}{1}{\@print{5.2.2}\quad{}Merge} \newlabel{cap:Alice's-branch-updated}{{5.3}{X}} \@addtocsec{htoc}{28}{1}{\@print{5.2.3}\quad{}Replay} \@addtocsec{htoc}{29}{1}{\@print{5.2.4}\quad{}Merging Back} \newlabel{cap:Bob's-branch-star-merge'd}{{5.4}{X}} \@addtocsec{htoc}{30}{1}{\@print{5.2.5}\quad{}Bug Fix Branches} \@addtocsec{htoc}{31}{0}{\@print{5.3}\quad{}Remote Cooperation and Publishing Your Work} \@addtocsec{htoc}{32}{1}{\@print{5.3.1}\quad{}Tags\label{sub:Tags}} \newlabel{sub:Tags}{{5.3.1}{X}} \@addtocsec{htoc}{33}{2}{\@print{5.3.1.1}\quad{}Release Markers\label{sub:Release-Markers}} \newlabel{sub:Release-Markers}{{5.3.1.1}{X}} \@addtocsec{htoc}{34}{2}{\@print{5.3.1.2}\quad{}Collections} \@addtocsec{htoc}{35}{2}{\@print{5.3.1.3}\quad{}Floating Tags} \@addtocsec{htoc}{36}{2}{\@print{5.3.1.4}\quad{}Limitations} \@addtocsec{htoc}{37}{1}{\@print{5.3.2}\quad{}export} \@addtocsec{htoc}{38}{1}{\@print{5.3.3}\quad{}Applying patches directly} \@addtocsec{htoc}{39}{1}{\@print{5.3.4}\quad{}\label{sub:Multiple-commiters-(a}Multiple commiters (a la CVS)} \newlabel{sub:Multiple-commiters-(a}{{5.3.4}{X}} \@addtocsec{htoc}{40}{0}{\@print{5.4}\quad{}\label{sec:Reverting-development}Reverting development} \newlabel{sec:Reverting-development}{{5.4}{X}} \@addtocsec{htoc}{41}{1}{\@print{5.4.1}\quad{}Before you commit} \@addtocsec{htoc}{42}{1}{\@print{5.4.2}\quad{}After you commit} \@addtocsec{htoc}{43}{2}{\@print{5.4.2.1}\quad{}Non-destructive revert} \@addtocsec{htoc}{44}{2}{\@print{5.4.2.2}\quad{}Destructive revert} \@addtocsec{htoc}{45}{0}{\@print{5.5}\quad{}Properties} \@addtocsec{htoc}{46}{1}{\@print{5.5.1}\quad{}Preserving File Permissions} \@addtocsec{htoc}{47}{1}{\@print{5.5.2}\quad{}User Defined Properties} \@addtocsec{htoc}{48}{1}{\@print{5.5.3}\quad{}End-of-Line Conversion} \@addtocsec{htoc}{49}{0}{\@print{5.6}\quad{}Hooks\label{sec:Hooks}} \newlabel{sec:Hooks}{{5.6}{X}} \@addtocsec{htoc}{50}{0}{\@print{5.7}\quad{}Patch Logs and Changelogs} \@addtocsec{htoc}{51}{0}{\@print{5.8}\quad{}Making Patches Bigger or Smaller} \@addtocsec{htoc}{52}{1}{\@print{5.8.1}\quad{}Selective commits} \@addtocsec{htoc}{53}{1}{\@print{5.8.2}\quad{}Breaking up patches\label{sub:Breaking-up-patches}} \newlabel{sub:Breaking-up-patches}{{5.8.2}{X}} \@addtocsec{htoc}{54}{1}{\@print{5.8.3}\quad{}Agglomerating patches} \@addtocsec{htoc}{55}{0}{\@print{5.9}\quad{}Working with Large Trees} \@addtocsec{htoc}{56}{1}{\@print{5.9.1}\quad{}arx edit} \@addtocsec{htoc}{57}{1}{\@print{5.9.2}\quad{}\label{sub:link-tree}link-tree} \newlabel{sub:link-tree}{{5.9.2}{X}} \@addtocsec{htoc}{58}{1}{\@print{5.9.3}\quad{}Timestamps} \@addtocsec{htoc}{59}{0}{\@print{5.10}\quad{}Cryptographic Checksums and Signatures} \@addtocsec{htoc}{60}{1}{\@print{5.10.1}\quad{}Theory} \@addtocsec{htoc}{61}{1}{\@print{5.10.2}\quad{}Practice} \@addtocsec{htoc}{62}{0}{\@print{5.11}\quad{}Internationalization} \@addtocsec{htoc}{63}{0}{\@print{5.12}\quad{}Including one project within another} \@addtocsec{htoc}{64}{0}{\@print{5.13}\quad{}Project Tree Inventories} \@addtocsec{htoc}{65}{1}{\@print{5.13.1}\quad{}\label{sub:Inventory-Tags}Inventory Ids} \newlabel{sub:Inventory-Tags}{{5.13.1}{X}} \@addtocsec{htoc}{66}{1}{\@print{5.13.2}\quad{}Inventory Types} \newlabel{Categories table}{{5.1}{X}} \@addtocsec{htoc}{67}{0}{\@print{5.14}\quad{}\label{sec:Pristine-Trees}Pristine Trees} \newlabel{sec:Pristine-Trees}{{5.14}{X}} \@addtocsec{htoc}{68}{0}{\@print{5.15}\quad{}Additional Tools} \@addtocsec{htoc}{69}{-1}{\@print{Chapter 6}\quad{}Beyond this manual} \@addtocsec{htoc}{70}{-1}{\@print{Appendix A}\quad{}Patch Algorithm} \@addtocsec{htoc}{71}{-1}{\@print{Appendix B}\quad{}Conflicts\label{cha:Conflicts}} \newlabel{cha:Conflicts}{{B}{X}} \@addtocsec{htoc}{72}{-1}{\@print{Appendix C}\quad{}Sample Merge Scripts\label{cha:Sample-Merge-Scripts}} \newlabel{cha:Sample-Merge-Scripts}{{C}{X}} \@addtocsec{htoc}{73}{0}{\@print{C.1}\quad{}Three way merges\label{sec:Three-way-merges}} \newlabel{sec:Three-way-merges}{{C.1}{X}} \@addtocsec{htoc}{74}{1}{\@print{C.1.1}\quad{}Meld} \@addtocsec{htoc}{75}{1}{\@print{C.1.2}\quad{}Xxdiff} \@addtocsec{htoc}{76}{1}{\@print{C.1.3}\quad{}kdiff3} \@addtocsec{htoc}{77}{1}{\@print{C.1.4}\quad{}gvimdiff} \@addtocsec{htoc}{78}{1}{\@print{C.1.5}\quad{}X/Emacs} \@addtocsec{htoc}{79}{0}{\@print{C.2}\quad{}Patch merges\label{sec:Patch-merges}} \newlabel{sec:Patch-merges}{{C.2}{X}}