title: How to resolve mercurial conflict where no match is found?
body: <p>I have managed to really get my repo into a state, and I don't have the mad skills required to fix it, your help would be appreciated.</p>
  
  <p>I am trying to merge/update so that the work I developed in a seperate branch is correctly integrated into my local one.</p>
  
  <p>When I run and run a merge on rev 284, I get the following error:</p>
  
  <blockquote>
    <p>% hg --repository C:\Projects\foo merge --verbose
    --tool=internal:merge 284 abort: data/Web/Utilities/Extensions/RegexExtensions.cs.i@364e78cf7bcb: no
    match found! [command returned code 255 Sat Jan 19 16:12:54 2013]</p>
  </blockquote>
  
  <p>I am using tortoisehg, and have tried to search for a resolution but I can't figure out how to resolve this error?</p>
  
  <p>What has happend in this case, is that the file has been deleted in one branch, and I guess exists in the other?</p>
  
  <p>How to resovle?</p>
  
  <p><img src="https://i.stack.imgur.com/OrCIu.png" alt="This is what it currenlty looks like">.</p>
  
  <p>Edit 1: </p>
  
  <p>Was fiddling around and found this as well:</p>
  
  <pre><code>#!python
  ** Mercurial version (2.4.2).  TortoiseHg version (2.6.2)
  ** Command: --nofork workbench
  ** CWD: C:\Projects\foo
  ** Encoding: cp1252
  ** Extensions loaded: 
  ** Python version: 2.7.3 (default, Apr 10 2012, 23:24:47) [MSC v.1500 64 bit (AMD64)]
  ** Windows version: sys.getwindowsversion(major=6, minor=1, build=7600, platform=2, service_pack='')
  ** Processor architecture: x64
  ** Qt-4.8.0 PyQt-4.9.1
  Traceback (most recent call last):
    File "tortoisehg\hgqt\repowidget.pyo", line 1678, in visualDiffToLocal
    File "tortoisehg\hgqt\visdiff.pyo", line 213, in visualdiff
    File "mercurial\copies.pyo", line 166, in pathcopies
    File "mercurial\copies.pyo", line 151, in _backwardcopies
    File "mercurial\copies.pyo", line 138, in _forwardcopies
    File "mercurial\copies.pyo", line 106, in _tracefile
    File "mercurial\context.pyo", line 722, in ancestors
    File "mercurial\context.pyo", line 546, in parents
    File "mercurial\util.pyo", line 246, in __get__
    File "mercurial\context.pyo", line 399, in _filenode
    File "mercurial\revlog.pyo", line 776, in lookup
  LookupError: data/web/Utilities/Extensions/RegexExtensions.cs.i@364e78cf7bcb: no match found
  </code></pre>
  
  <p>Edit 2:</p>
  
  <p>I've managed to merge most of the revisions I need, I am left now with just one on the branch that is corrupt.</p>
  
  <p>How can I now discard that revision/branch?</p>
  
  <p><img src="https://i.stack.imgur.com/S4Dke.png" alt=""></p>