"I could not get across to San Francisco as I said I would, and when I was there you had quarrelled with your uncle and returned. 
I could not get across to San Francisco as I said I would, and when I did you had quarrelled with your uncle and left. 