My problem is that I'm borderline diabetic (probably am, but can't afford the doctor right now). I'm constantly thirsty (major symptom). But, if I drink too much liquid of any kind, my feet, ankles, and even my calves can swell. So, oddly enough, my swelling is my indication on when I've had enough liquids.
2 years ago, when I found out about my blood sugar levels via my Dad, I switched from drinking sweet tea to unsweet tea. Just by doing that, I dropped 20 lbs of weight. Pretty sweet! So, unsweet tea is my major drink all day. I switch it up with a small glass of orange juice, a small glass of pepsi, or a small glass of milk (or some combination thereof).
Someone mentioned about not drinking until thirsty. I've read several times over the years that the 8 glasses of water a day is only a recommendation, not a rule of thumb. Many people need more and many need less water in a day. And even that varies from day to day depending on many factors (environment, health, food intake, emotions, etc).