comparison en/ch05-daily.tex @ 650:f72b7e6cbe90

Snapshot.
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 05 Feb 2009 00:01:16 -0800
parents 5cd47f721686
children
comparison
equal deleted inserted replaced
649:5cd47f721686 650:f72b7e6cbe90
134 On the other hand, if you deleted the missing file by accident, use 134 On the other hand, if you deleted the missing file by accident, use
135 \hgcmdargs{revert}{\emph{filename}} to recover the file. It will 135 \hgcmdargs{revert}{\emph{filename}} to recover the file. It will
136 reappear, in unmodified form. 136 reappear, in unmodified form.
137 \interaction{daily.files.recover-missing} 137 \interaction{daily.files.recover-missing}
138 138
139 \subsection{Aside: why tell Mercurial explicitly to 139 \subsection{Aside: why tell Mercurial explicitly to remove a file?}
140 remove a file?}
141 140
142 You might wonder why Mercurial requires you to explicitly tell it that 141 You might wonder why Mercurial requires you to explicitly tell it that
143 you are deleting a file. Early during the development of Mercurial, 142 you are deleting a file. Early during the development of Mercurial,
144 it let you delete a file however you pleased; Mercurial would notice 143 it let you delete a file however you pleased; Mercurial would notice
145 the absence of the file automatically when you next ran a 144 the absence of the file automatically when you next ran a
146 \hgcmd{commit}, and stop tracking the file. In practice, this made it 145 \hgcmd{commit}, and stop tracking the file. In practice, this made it
147 too easy to accidentally remove a file without noticing. 146 too easy to accidentally remove a file without noticing.
148 147
149 \subsection{Useful shorthand---adding and removing files 148 \subsection{Useful shorthand---adding and removing files in one step}
150 in one step}
151 149
152 Mercurial offers a combination command, \hgcmd{addremove}, that adds 150 Mercurial offers a combination command, \hgcmd{addremove}, that adds
153 untracked files and marks missing files as removed. 151 untracked files and marks missing files as removed.
154 \interaction{daily.files.addremove} 152 \interaction{daily.files.addremove}
155 The \hgcmd{commit} command also provides a \hgopt{commit}{-A} option 153 The \hgcmd{commit} command also provides a \hgopt{commit}{-A} option