Compile error with exa-damagetrack branch

[Daniel Kasak]

Hi Michel. Thanks again for the response :)


Michel Dänzer wrote:
> 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?

commit 7e4717683d6c08d1e490a60b7493a94bbc57bf8d
Author: Michel D<C3><A4>nzer <michel at tungstengraphics.com>
Date:   Sun Oct 15 18:12:28 2006 +0200

    exaDrawableDirty: Fix initialization of BoxRec.
   
    This will hopefully fix the partial window corruption experienced by
some
    people.

commit f9f33b72e34eaeccea2a20f4a3dd68c2dbefc90e
Author: Michel D<C3><A4>nzer <michel at tungstengraphics.com>
Date:   Mon Jun 12 20:19:11 2006 +0200

    Track per-drawable damage to minimize UTS and DFS transfers.
   
    Based on work by Eric Anholt.

commit 6060b612de6b41f872d034c6130770c1d189d0a3
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jun 12 20:12:31 2006 +0200

    Provide option to report damage after operation is complete.

>  And what about
>
> md5sum exa/exa_migration.c
>   

22e7b6bd5fd7b56ace87bdc9e038d090  exa/exa_migration.c