[cairo] Re: [cairo-commit] src/cairo-png.c
behdad at behdad.org
Mon Apr 23 14:37:34 PDT 2007
On Mon, 2007-04-23 at 23:32 +0200, Peter Weilbacher (Mozilla) wrote:
> Behdad Esfahbod wrote:
> > On Mon, 2007-04-23 at 15:28 -0400, Peter Weilbacher (Mozilla) wrote:
> >> Reading cairo-png.c in the subject reminds me of
> >> https://bugs.freedesktop.org/show_bug.cgi?id=9464
> >> which I run into very often. I'm still wondering why I am the
> >> only one...
> >> Let me phrase it differently this time, to finally get somewhere
> >> with it: if nobody objects, I will push it in until the end of the
> >> week.
> > Go ahead!
> Bloody hell! I pushed it like I always did the OS/2 stuff but something
> must have gone completely wrong, because what I did seems to have
> reverted some of the earlier changes. Not sure what happened, but now
> I need help from somebody to clean up the mess.
It's all fine, it's just that you marged an old branch instead of
rebasing it to the latest master. Just use git-rebase and things look a
"Those who would give up Essential Liberty to purchase a little
Temporary Safety, deserve neither Liberty nor Safety."
-- Benjamin Franklin, 1759
More information about the cairo