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.
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.
If I try to merge I get this message
abort: data/hotelsclick/src/main/res/values/string-array.xml.i@5f2b6faa86a1: no match found!
if I try to delete that useless revision with hg strip 678 I get
abort: data/hotelsclick/src/main/res/values/string-array.xml.i@5f2b6faa86a1: no node!
and if I perform a hg verify this is the result
checking files [...]/src/main/res/values/string-array.xml@678: 5f2b6faa86a1 in manifests not foundlibs/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)
what if I try to push?
searching for changes abort: push creates new remote head 16c4912af9a5! (merge or see "hg help push" for details about pushing new heads)
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.