Hello, I'm having these strange issues when moving my code onto my production environment. I start out by doing my PHP code within the trunk. When I'm done, I merge my changes into a release branch and then deploy it via Beanstalkapp to my staging environment. When I'm sure that the code is in working order, I then deploy it manually via Beanstalkapp. Once the manual deployment is complete, I verify my changes are on production and continue working inside the trunk. Now, the strange part is that I get a phone call from my client stating that the changes that I've done are not being shown. When I go in and check the code, it's not there anymore. When I do the deployment a second time, the changes are shown to be correct again and this time, it sticks. I'm not sure if this has to do something with Subversion or the fact that I'm using Beanstalkapp to move my code around, but this one is the most recent one. Another instance of my code reverting itself would be when I was doing changes to my trunk and I'm doing micro-commits. I've noticed that the changes that I have been doing were there, but some changes aren't. For example, I was editing fileA.php for a few commits. I wouldn't see the changes I've made two revisions ago, but I'd see changes that I've made at the current revision. It seemed like my code was mixing itself up for some reason. Anyone have any suggestions on what I can do to fix this?
Thanks!
