问题
We have encountered a situation with Hg where no matter which way we merge two branches it wants to delete hundreds of files completely unexpectedly. i.e. merge branch A into B or B into A. More baffling no one has physically deleted them.
Has anyone experienced this and can give guidance - this has become a major issue for us?
Thanks.
回答1:
Could there be a rename of a folder/directory involved? Perhaps one that's only a case change (ex: Stuff
to stuff
)? That could show up as a lot of deletions in some views, but of course isn't actually handled that way.
In short, it's extremely unlikely that what's happening is what it looks like is happening. With more detail we can work together to figure it out, but if you got help in the Mailing list or IRC please provide a followup here too.
回答2:
As noted in comments - this is same issue as my colleague posted and the answer is there.
来源:https://stackoverflow.com/questions/7833175/mercurial-merge-has-unexpectedly-deleted-source-files