Occasional case-folding error when trying to transplant or graft

Matt Mackall mpm at selenic.com
Thu Feb 2 18:17:48 UTC 2012


On Thu, 2012-02-02 at 07:08 -0800, JohnRenstrom wrote:

> Just wait for the day when the same file w/mixed case has been added
> to two different branches and you try to perform a
> transplant/graft...That is when your head wants to spin 360 degrees
> and explode!  ;(

Current hg will refuse to do merges, rebases, or grafts with case
collisions until the collision is resolved. Transplant is another story.

-- 
Mathematics is the supreme nostalgia of our time.





More information about the Mercurial-devel mailing list