Build failure on master with OSX - datetime.hxx

Lionel Elie Mamane lionel at mamane.lu
Mon Apr 22 01:34:56 PDT 2013


On Mon, Apr 22, 2013 at 10:28:21AM +0200, Alexander Thurgood wrote:
> Le 22/04/13 10:20, Lionel Elie Mamane a écrit :
>> On Mon, Apr 22, 2013 at 09:29:45AM +0200, Alexander Thurgood wrote:

>> Should have been fixed by

>> commit 693d25f8a601ee3738a396fbd8a9b838f19e39c9

> Ah, OK, I started my build before that commit went in. Will do a fresh
> pull/build.

Some git recipes for such cases:

First, do "git fetch". It will do the first half of a pull, that is
fetch the new commits from the central repository, but without
touching your local branches / tree.

Then, you can do stuff like:

git diff HEAD..remotes/origin/master -- path/to/file.cxx
git log -p HEAD..remotes/origin/master -- path/to/file.cxx
git blame remotes/origin/master -- path/to/file.cxx

to see the state of that file in the central repository, and see if
the failing line has been changed since you last pulled.

-- 
Lionel


More information about the LibreOffice mailing list