Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 416237 - dev-vcs/git-9999 - Failed Patch: git-1.7.3.5-optional-cvs.patch !
Summary: dev-vcs/git-9999 - Failed Patch: git-1.7.3.5-optional-cvs.patch !
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All All
: Normal normal (vote)
Assignee: Robin Johnson
URL:
Whiteboard:
Keywords: PATCH
Depends on:
Blocks:
 
Reported: 2012-05-16 09:23 UTC by Andreas Wiese
Modified: 2012-06-26 14:16 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
updated patch (git-1.7.10.2-optional-cvs.patch,10.82 KB, patch)
2012-05-16 09:24 UTC, Andreas Wiese
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Andreas Wiese 2012-05-16 09:23:23 UTC
When trying to build dev-vcs/git[=9999] applying the git-1.7.3.5-optional-cvs.patch fails due to recent updates in tests and Makefile.

Reproducible: Always

Steps to Reproduce:
1. ACCEPTABLE_KEYWORDS="**" emerge -avt 'dev-vcs/git[=9999]'
2. Watch it fail.
3. Cry a bit.
Actual Results:  
  * Applying git-1.7.3.5-optional-cvs.patch ...
 
  * Failed Patch: git-1.7.3.5-optional-cvs.patch !
  *  ( /var/db/paludis/repositories/gentoo/dev-vcs/git/files/git-1.7.3.5-optional-cvs.patch )
  * 
  * Include in your bugreport the contents of:
  * 
  *   /var/tmp/paludis/dev-vcs-git-9999/temp//git-1.7.3.5-optional-cvs.patch.out
 


Expected Results:  
 * Applying git-1.7.3.5-optional-cvs.patch ... [ok]
Comment 1 Andreas Wiese 2012-05-16 09:24:41 UTC
Created attachment 311985 [details, diff]
updated patch

updated the patch to apply to git >1.7.10.2-*
Comment 2 Jeremy Olexa (darkside) (RETIRED) archtester gentoo-dev Security 2012-06-26 14:16:33 UTC
I guess it was fixed?

>>> Preparing source in /var/tmp/portage/dev-vcs/git-9999/work/git-9999 ...
 * Applying git-1.7.11-optional-cvs.patch ...                            [ ok ]
 * Applying git-1.7.8-git-svn-1.7-canonical-path.patch ...               [ ok ]
>>> Source prepared.