annotate help/a-23.html @ 633:db62a0cb3037

* Added setting to specify that diff command should be run once for each selected file, rather than passing all file names to diff command (p4merge doesn't like being given many files)
author Sam Izzo <sam@humbug.net>
date Mon, 27 Aug 2012 01:26:57 +1000
parents 21aa41b62c3a
children
rev   line source
Chris@496 1 <link rel="stylesheet" type="text/css" href="help.css"/>
Chris@496 2
Chris@496 3
Chris@497 4 <h2>I just deleted a file using the system file manager &ndash; then remembered I hadn't told the version control tool about it &ndash; what now?</h2>
Chris@497 5
Chris@498 6 <p>Any files that the version control system thinks should be there, but
Chris@498 7 that can't be found in your working copy are shown as <b>&ldquo;Missing&rdquo;</b>
Chris@498 8 under &ldquo;My work&rdquo;. All you need to do is:</p>
Chris@497 9
Chris@497 10 <p><b>1. Find your file in the &ldquo;Missing&rdquo; list and select it</b></p>
Chris@497 11
Chris@497 12 <p><b>2. Click Remove in the toolbar on the left of the window</b></p>
Chris@497 13
Chris@497 14 <p>This tells Mercurial that you haven't merely lost the file, but that
Chris@497 15 you intended to remove it. The next time you commit, it will be
Chris@497 16 removed from tracking in version control.</p>
Chris@497 17
Chris@496 18
Chris@496 19