On Mon, Aug 27, 2012 at 2:20 PM, John J Barton <[email protected]> wrote: > On Mon, Aug 27, 2012 at 2:09 PM, Vincent Scheib <[email protected]> wrote: >> Using svn or git? If git, check your diff origin/master...HEAD, consider >> using the -g command line to make explicit your intended diff. > > Bingo! I've been using the cr script to update my repo; looks like it > does not use origin/master. So my origin/master fell behind and > webkit-patch got confused. > > git fetch > > fixed it all up. I'll report a bug on cr.
I dug a bit deeper and I think cr tripped on an obscure case where |git pull --rebase| isn't equivalent to |git fetch && git rebase|: https://github.com/jankeromnes/cr/issues/3 jjb _______________________________________________ webkit-dev mailing list [email protected] http://lists.webkit.org/mailman/listinfo/webkit-dev
