CODEWITHSUNDEEP
mercurialdvcs
Zabs
Zabs

Reputation: 14142

Mercurial - cannot commit merge with missing files error

I have done a 'hg merge' however when I attempt to do a 'hg commit -m "my msg.." I get the following error message :

abort: cannot commit merge with missing files

Can anyone explain how to fix this to allow the commit go through?

Upvotes: 37

Views: 18212

Answers (3)

Iasmini Gomes
Iasmini Gomes

Reputation: 795

If you are using TortoiseHG, click in View/Commit. It will show you files in state ! (missing).

Right click on the file and choose Revert (undelete the file) and commit.

Upvotes: 3

Shayne
Shayne

Reputation: 1624

Heres my approach

hg status will tell you what files are missing. Then you can either restore the file from somewhere

OR type in hg remove <path/name of missing file>

THEN commit. Your repo will be sane again, darwin willing.

Upvotes: 14

Aaron Digulla
Aaron Digulla

Reputation: 328594

Try hg status and look for files in state ! (missing).

The cause is that one of the files which is part of the merge has been deleted. Undelete the file and try again.

Upvotes: 58

Related Questions