search

sagemath / sage-workflow

script(s) to help with the transition to a single Sage repository
10 stars 9 forks source link

Error importing patches #34

Open tscrim opened 10 years ago

tscrim commented 10 years ago

Hey everyone, I get the following error when trying to import the patch on http://trac.sagemath.org/ticket/14912:

travis@Kristine-Desktop:~/sage$ sage --dev import-patch --local ~/Downloads/trac14912-unique_doc.patch 

The patch does not apply cleanly. Reject files will be created for the parts that do not apply if you proceed.
Apply it anyway? [yes/No] yes
/home/travis/.sage/temp/Kristine-Desktop/3983/tmp_i9v0w4:59: trailing whitespace.
    This class is intended to make it easy to cache objects. 
/home/travis/.sage/temp/Kristine-Desktop/3983/tmp_i9v0w4:73: trailing whitespace.
    but not affect the caching. 
Checking patch src/sage/structure/factory.pyx...
Hunk #2 succeeded at 69 (offset 1 line).
Hunk #3 succeeded at 240 (offset 1 line).
Checking patch src/sage/structure/unique_representation.py...
Applied patch src/sage/structure/factory.pyx cleanly.
Applied patch src/sage/structure/unique_representation.py cleanly.
warning: 2 lines add whitespace errors.
It seemed that the patch would not apply, but in fact it did.
GitError: git exited with a non-zero exit code (1).
This happened while executing "git am --resolved --resolvemsg= ".
git printed nothing to STDOUT.
git printed the following to STDERR:
git: 'am' is not a git command. See 'git --help'.

I do have "git am ..." showing up in my system-wide git install. Any ideas what's going on here? (Similar issue with the last patch in http://trac.sagemath.org/ticket/9280.)

Thanks, Travis

ohanar commented 10 years ago

The dev tools use sage's copy of git. Please post the git spkg build log somewhere and then try sage -f git (git seems to rarely not install correctly). On Dec 9, 2013 8:51 AM, "Travis Scrimshaw" notifications@github.com wrote:

Hey everyone, I get the following error when trying to import the patch on http://trac.sagemath.org/ticket/14912:

travis@Kristine-Desktop:~/sage$ sage --dev import-patch --local ~/Downloads/trac14912-unique_doc.patch

The patch does not apply cleanly. Reject files will be created for the parts that do not apply if you proceed. Apply it anyway? [yes/No] yes /home/travis/.sage/temp/Kristine-Desktop/3983/tmp_i9v0w4:59: trailing whitespace. This class is intended to make it easy to cache objects. /home/travis/.sage/temp/Kristine-Desktop/3983/tmp_i9v0w4:73: trailing whitespace. but not affect the caching. Checking patch src/sage/structure/factory.pyx... Hunk #2 succeeded at 69 (offset 1 line). Hunk #3 succeeded at 240 (offset 1 line). Checking patch src/sage/structure/unique_representation.py... Applied patch src/sage/structure/factory.pyx cleanly. Applied patch src/sage/structure/unique_representation.py cleanly. warning: 2 lines add whitespace errors. It seemed that the patch would not apply, but in fact it did. GitError: git exited with a non-zero exit code (1). This happened while executing "git am --resolved --resolvemsg= ". git printed nothing to STDOUT. git printed the following to STDERR: git: 'am' is not a git command. See 'git --help'.

I do have "git am ..." showing up in my system-wide git install. Any ideas what's going on here? (Similar issue with the last patch in http://trac.sagemath.org/ticket/9280.)

— Reply to this email directly or view it on GitHubhttps://github.com/sagemath/sage-workflow/issues/34 .

tscrim commented 10 years ago

Ah, that was the problem. When I installed this version of Sage, I don't think it built the git spkg.

Would it be possible to use the system-wide install of git if is available, otherwise could we make sure this is put into the documentation if Sage doesn't build the git spkg by default?

Thanks.