Re: [orca-list] Applying Patches

[Steve Holmes <steve holmes88 gmail com>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: RIPEMD160

That's one of the reasons I was anxious for the patch to be applied to
git master; I'm not sure the best way to apply patches created with
git.  I'm still new to git so not sure the git command used to apply
patches like this.  When I created the patch, I did my changes in a
local branch of my git working directory and committed it; then I ued
the 'git format-patch master' to build it.  I'll need to study git
more and see what is used to apply patches created by others back into
a local git tree.  Until I figure this out, maybe someone else can
explain more readily, how to do this.

Thanks for the interest in checking out the OpenTTS module.

On Wed, May 19, 2010 at 03:06:58PM +0100, Paul Hunt wrote:
> Hi all,
>
> I need some help with applying patches from bugzilla to Orca.
>
> I have the Orca git repo cloned in ~/apps/orca and it's currently
> pointed at the head of the master branch.
>
> I want to test the opentts patch Steve made (attached to bug 618927).
>
> I followed the instructions at
> http://live.gnome.org/Orca/HowCanIHelp which tells you how to write
> a function to put in your ~/.bashrc that will download patches for
> you.
>
> I had to change the URL because it seems that it has changed since
> the function was written but I've got it working now and I've got
> the patch in my /apps/orca/patches directory.
>
> But when I go to my apps/orca directory and try to apply it with the command
>
> patch -p0 < patches/patch.161312
>
> it fails.
>
> The openttsfactory file is created, although it doesn't go into the
> src/orca directory it goes into a directory called b/src/orca, and
> the single line changes to Makefile.am and settings.py are rejected.
>
> Can someone help?  I'd like to get onboard helping out with the
> switch to opentts for Orca.
>
> Cheers.
> Paul
> _______________________________________________
> orca-list mailing list
> orca-list gnome org
> http://mail.gnome.org/mailman/listinfo/orca-list
> Visit http://live.gnome.org/Orca for more information on Orca.
> The manual is at http://library.gnome.org/users/gnome-access-guide/nightly/ats-2.html
> The FAQ is at http://live.gnome.org/Orca/FrequentlyAskedQuestions
> Netiquette Guidelines are at http://live.gnome.org/Orca/FrequentlyAskedQuestions/NetiquetteGuidelines
> Log bugs and feature requests at http://bugzilla.gnome.org
> Find out how to help at http://live.gnome.org/Orca/HowCanIHelp
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEAREDAAYFAkvz/iQACgkQWSjv55S0LfEMlgCg9fk7JpOAPw5mO1aVNmY3Jt+6
M1kAmQHq7G6KXA3Mts7ShGq8TOuTcnZU
=GcI5
-----END PGP SIGNATURE-----