Possible problem in repository xf86-video-savage

[pcpa at mandriva.com.br]

  Hi,

  Just possibly showing my "dumbness" about git, but this was the only
case so far I found this kind or problem, so trying to describe it in
the repository I found the possible problem:

$ git clone git://anongit.freedesktop.org/git/xorg/driver/xf86-video-savage
xf86-video-savage at freedesktop
$ cd xf86-video-savage at freedesktop
$ git-archive --format=tar --prefix=xf86-video-savage-2.1.3/
xf86-video-savage-2.1.3 > xf86-video-savage-2.1.3.tar

Now assume for some reason we want to generate patches from tag
xf86-video-savage-2.1.3 up to commit ffc5ba7f0b1cdefdcecf6bd47018b6a4924bfc44

$ git format-patch
xf86-video-savage-2.1.3..ffc5ba7f0b1cdefdcecf6bd47018b6a4924bfc44

That should generate the files:
0001-Minimal-change-set-to-convert-driver-to-the-new-PCI.patch
0002-Include-unistd.h-to-get-a-declaration-for-usleep.patch
0003-dos2unix.patch
0004-Merge-PCI-rework-support-and-classic-PCI-interface.patch

Now testing:
$ tar xf xf86-video-savage-2.1.3.tar
$ cd xf86-video-savage-2.1.3
$ patch -p1 < ../0001-Minimal-change-set-to-convert-driver-to-the-new-PCI.patch
patching file configure.ac
patching file src/savage_dri.c
Hunk #1 succeeded at 467 (offset 7 lines).
Hunk #2 succeeded at 882 (offset 7 lines).
patching file src/savage_driver.c
Hunk #4 succeeded at 273 (offset 2 lines).
Hunk #5 succeeded at 792 (offset 2 lines).
Hunk #6 succeeded at 1378 (offset 67 lines).
Hunk #7 succeeded at 1386 (offset 67 lines).
Hunk #8 succeeded at 1396 (offset 67 lines).
Hunk #9 succeeded at 1409 (offset 67 lines).
Hunk #10 succeeded at 1418 (offset 67 lines).
Hunk #11 succeeded at 2822 (offset 71 lines).
Hunk #12 succeeded at 2859 (offset 71 lines).
Hunk #13 succeeded at 2874 (offset 71 lines).
Hunk #14 succeeded at 2905 with fuzz 2 (offset 68 lines).
Hunk #15 succeeded at 2927 (offset 68 lines).
patching file src/savage_driver.h
Hunk #1 FAILED at 33.
Hunk #2 FAILED at 365.
2 out of 2 hunks FAILED -- saving rejects to file src/savage_driver.h.rej
-------------------
So it fails here.


A possible culprit is:
--
commit 68ceead721aeb75b9faed6297407a320a83499e4
Merge: da23218... bf5e2a5...
Author: Ian Romanick <idr at us.ibm.com>
Date:   Wed Aug 22 11:45:43 2007 -0700

    Merge branch 'master' into pci-rework

    Conflicts:

        src/savage_driver.h
--

  The ``Conflicts:'' sounds suspect.


  Another possible culprit I can see is the commit:
--
commit da23218b067d9b1808fc1168737c79b3349af09e
Author: Ian Romanick <idr at us.ibm.com>
Date:   Wed Aug 22 11:42:47 2007 -0700

    dos2unix

--

  That does what the message says, i.e. converts a file with lines ending
in ^M's to unix format, and src/savage_driver.h.rej is suspicious as it
includes a lot of ^M's.

  Well, I tried to build a test case but could not repeat it, maybe need
to create the test case with several overlaping changes... Or maybe there
is a real problem in the repository that was caused by some merge, and
may need some git-reset or the like to fix.

  The git version being used is 1.5.3.5 without any patches or modifications.

  If we have an outdated version of git in Mandriva, or I am just being
dumb, fell free to tell me. I am still somewhat new to git... :-)

Thanks,
Paulo