Drinking loads of water will not make you retain water, but dehydration will. If your body feels worried that it's not getting enough water, it will hold on to what it has.
Water does make you pee and you will notice more trips to the loo, but you can lessen the effects by drinking throughout the day rather than chugging a couple of glasses in one go. If you drink more than one or two ...