The name of an old movie?

There is an old movie I am trying to remember the name of, from perhaps the early 80's. I don't know the names of the actors in the movie either. But in the movie a man starts to have dreams of a different life time, and he realizes he may have been reincarnated, and is drawn to the place where he once lived. He starts to have dreams of being killed by a woman. When he goes to the city from his dreams, he meets the woman who killed him. She realizes who he is, and they end up in a small boat in the water at night, and she hits him over the head with the boat paddle and kills him again in the current lifetime.