What the heck is up with Mercurial???
Posted by davidbyron on 2009-10-08 13:34
I pull diffs and update. Hg says its updated a few files. I commit my changes and push. So far fine.
http://trac-hg.assembla.com/openrpg_dev/changeset/420%3A19e911dbd2f5
I check out the diff (above) to make sure its what it ought to be and I notice I left in 3 print statements for debugging. This is just a minute or three later so I don't bother to pull again, I just make the edit, commit and push. I look at the diff and there's eleven changes there now. Huh??
http://trac-hg.assembla.com/openrpg_dev/changeset/421%3Aae2385f0f7be
It looks like somehow DJ's changes from the day before to that file didn't get updated on my local copy by the push / update and then I wrote over his changes with my unchanged file when I pushed. Except not three minutes earlier I already pushed that exact same file without reversing those edits.
Hm. I bet it was because I had that file up being edited with IDLE. Must have overwritten after the hg update. No warning in IDLE. Crap.
http://trac-hg.assembla.com/openrpg_dev/changeset/420%3A19e911dbd2f5
I check out the diff (above) to make sure its what it ought to be and I notice I left in 3 print statements for debugging. This is just a minute or three later so I don't bother to pull again, I just make the edit, commit and push. I look at the diff and there's eleven changes there now. Huh??
http://trac-hg.assembla.com/openrpg_dev/changeset/421%3Aae2385f0f7be
It looks like somehow DJ's changes from the day before to that file didn't get updated on my local copy by the push / update and then I wrote over his changes with my unchanged file when I pushed. Except not three minutes earlier I already pushed that exact same file without reversing those edits.
Hm. I bet it was because I had that file up being edited with IDLE. Must have overwritten after the hg update. No warning in IDLE. Crap.
Home / Developer API / Tour / Get a Project - Solutions for Bug & Issue Tracking, Collaboration Tools, Subversion Hosting, Git Hosting
Openrpg is powered by Assembla.
2 Comments
By davidbyron on 2009-10-08 13:49
Oh cute: if you put a revision name in a comment trac turns it into a link for you.
By Digitalxero on 2009-10-08 13:58