Hey, folks! I just wanted to take some time to explain a problem I had.
I noticed today that some of the work I'd done to more aggressively
cache memcached objects had disappeared out of the current repository.
One example is this commit:
http://gitorious.org/statusnet/mainline/commit/abc9b332412921e7ae7f730b23e186bcba412486
The actual code was missing, but 'git blame' didn't show anyone changing
the code. If I ran "git log", I could see the change, but "git log
classes/Memcached_DataObject.php" didn't show it.
I was a little confused as to how that had happened, so I asked in
#statusnet, and helfire and brion used git bisect to find the change
that caused the error:
http://gitorious.org/statusnet/mainline/commit/866dfa6822df54765a9b92336722d86cfad6b123
We had lots of discussion about rebasing and fast-forwarding and all
that jazz, but frankly that's all waaaaaaay over my head, and I didn't
think I'd actually done any of that. So, what had I done?
I figured it out when trying to revert the change (which, y'know, isn't
supposed to work). Reverting caused a conflict, which I used git
mergetool to resolve, which launched meld. Meld used to have arrows to
copy a single conflict right or left, but those are broken, so I've been
using the context menu, 'Copy right' or 'Copy left'.
Except those don't copy a single conflict; they copy the whole file!
So: I'd accidentally copied the whole file from the branch without my
memcache changes, and it'd messed everything up.
Anyways, I've manually merged, pushed the resulting change, and vowed
not to use meld again to resolve conflict. (I'm using diffuse, which is
a little clunkier but usable.)
Thanks to everyone who helped out with debugging this.
-Evan
--
Evan Prodromou
CEO, StatusNet, Inc.
e...@status.net - http://identi.ca/evan - +1-514-554-3826
_______________________________________________
StatusNet-dev mailing list
StatusNet-dev@lists.status.net
http://lists.status.net/mailman/listinfo/statusnet-dev
