Compile error with exa-damagetrack branch

[Daniel Kasak]

Thanks for the response :)

Michel Dänzer wrote:
> On Tue, 2006-10-17 at 11:20 +0200, Michel Dänzer wrote:
>   
>> On Tue, 2006-10-17 at 13:38 +1000, Daniel Kasak wrote:
>>     
>>> exa_migration.c:507: error: 'data_row_bytes' undeclared (first use in
>>> this function)
>>>       
>> exa_migration.c doesn't contain the string data_row_bytes on
>> exa-damagetrack. Does git-diff show any local modifications?
>>     

No.

> 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.

Dan