Compile error with exa-damagetrack branch

[Michel Dänzer]

On Tue, 2006-10-17 at 22:35 +1000, Daniel Kasak wrote:
> 
> Michel Dänzer wrote:
> > 
> > Or, if you ran git-pull with exa-damagetrack checked out, it merged in
> > the master branch, and you apparently didn't resolve the merge conflict
> > in exa_migration.c correctly (you should just keep the exa-damagetrack
> > bits).
> >   
> 
> I started out by checking out the main branch:
> 
> git clone git://anongit.freedesktop.org/git/xorg/xserver
> 
> I then checked out the exa-damagetrack branch:
> 
> git checkout exa-damagetrack
> 
> This command completed successfully without *any* output. I've tried
> deleting everything and repeating the above 2 steps to check out the
> exa-damagetrack branch - same thing exactly.

Weird. What does

git-log origin..exa-damagetrack

say? And what about

md5sum exa/exa_migration.c


-- 
Earthling Michel Dänzer           |          http://tungstengraphics.com
Libre software enthusiast         |          Debian, X and DRI developer