Mercurial: "no match found" when performing merge, "no node!" if I try to strip
<p>I have a mercurial dropbox hosted in a Dropbox folder on which I push from another repo that I keep in my office PC. In this way I can work on my project from the office and perform hotfixes from home.</p>
<p>Something bad happened while synchronizing, therefore a file wasn't correctly put in sync somewhere. I have a revision (n. 678) which I can't merge with actual head.</p>
<p><a href="https://i.stack.imgur.com/nHblS.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/nHblS.png" alt="enter image description here" /></a></p>
<p>If I try to merge I get this message</p>
<blockquote>
<p>abort:
data/hotelsclick/src/main/res/values/string-array.xml.i@5f2b6faa86a1:
no match found!</p>
</blockquote>
<p>if I try to delete that useless revision with <em>hg strip 678</em> I get</p>
<blockquote>
<p>abort:
data/hotelsclick/src/main/res/values/string-array.xml.i@5f2b6faa86a1:
no node!</p>
</blockquote>
<p>and if I perform a <em>hg verify</em> this is the result</p>
<blockquote>
<pre><code>checking files  [...]/src/main/res/values/string-array.xml@678: 5f2b6faa86a1 in manifests not found 
</code></pre>
<p>libs/date-interval-picker/.git/index@678: a83e1b77d446 in manifests
not found 8009 files, 681 changesets, 14161 total revisions 2
integrity errors encountered! (first damaged changeset appears to be
678)</p>
</blockquote>
<p>what if I try to push?</p>
<blockquote>
<p>searching for changes
abort: push creates new remote head 16c4912af9a5!
(merge or see &quot;hg help push&quot; for details about pushing new heads)</p>
</blockquote>
<p>So I cannot merge, cannot delete that revision, cannot push. I'm pretty stuck and I don't know why. Can anybody please help? I don't care about the content of revision 678, if I could I'd delete it happily.</p>