An agreement aimed at ensuring more regular water from Mexico to the United States has been reached, both governments said on Saturday, following a long period of tension over a decades-old treaty.