On Tue, Sep 20, 2016 at 9:34 PM, Caleb Williams <cale...@gmail.com> wrote:
> > Oh but you made a small mistake.
> > If you would have used: git apply
> > 0001-Fix-testing-of-jar-in-FHS-location.patch
>
> > Thenn all the author information would have been used. Like this it was
> > written like its your patch. Some people could either take this the
> > wrong way (unfair) or generally it helps with git blame if you have
> > this info :-)
>
> Mike,
>
> Can we revert your commit and re-apply with git apply? Does SourceForge
> support this feature?
>
> I'll give it a try at least.
>
> Thanks,
>
> Caleb
>
Gave it a shot and got an error message as follows:
Caleb@caleb-laptop ~/Desktop/FreeCol Repository/freecol (master)
$ git apply 0001-Fix-testing-of-jar-in-FHS-location.patch
0001-Fix-testing-of-jar-in-FHS-location.patch:21: trailing whitespace.
elif test -r "/usr/share/java/${FREECOLJAR}" ; then
warning: packaging/common/freecol.sh has type 100644, expected 100755
error: patch failed: packaging/common/freecol.sh:66
error: packaging/common/freecol.sh: patch does not apply
Can you give it a shot Mike?
Thanks,
- Caleb
>
------------------------------------------------------------------------------
_______________________________________________
Freecol-developers mailing list
Freecol-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freecol-developers
