view help/a-23.html @ 505:1c05e7576ea5

Fix bug #292: "Merge that results in no changes leaves interface in inconsistent state." Show uncommitted state whenever a merge is present, even if no file changes

<link rel="stylesheet" type="text/css" href="help.css"/>


<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>

<p>Any files that the version control system thinks should be there, but
that can't be found in your working copy are shown as <b>&ldquo;Missing&rdquo;</b>
under &ldquo;My work&rdquo;.  All you need to do is:</p>

<p><b>1. Find your file in the &ldquo;Missing&rdquo; list and select it</b></p>

<p><b>2. Click Remove in the toolbar on the left of the window</b></p>

<p>This tells Mercurial that you haven't merely lost the file, but that
you intended to remove it.  The next time you commit, it will be
removed from tracking in version control.</p>