Pull error: abort: foo.i at b7138dfe61ab: no match found!

[Pavel Shevaev]

Folks, I'm trying to do a merge of two branches and I'm getting this
error and don't know what to do...

Here is what I'm doing:

hg clone ssh://.../master
cd master && hg pull -u ssh://../branchA
pulling from ssh://../branchA
searching for changes
adding changesets
adding manifests
adding file changes
added 26 changesets with 57 changes to 316 files
abort: foo.i at b7138dfe61ab: no match found!

After this when I type "hg st" I get some files with statuses "?" and "!"

I thought maybe it was a mercurial but and I tried upgrading 1.1.2 to
1.3 but this error still happens.

Any idea how to fix it?

-- 
Best regards, Pavel