Re: [PATCH] fdo#58370 - 'Send Feedback...' URL invalid in other language...

On 12/18/2012 05:01 PM, Rob Snelders wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi Kohei,
>
> Op 18-12-12 23:00, Kohei Yoshida schreef:
> > On 12/18/2012 04:53 PM, Rob Snelders wrote:
> > > Would it be possible to apply this to the master and to the
> > > 4.0-branch as the current URL of 4.0 gives problems.
> >
> > I just approved this which should push your patch to master.  Feel
> > free to cherry-pick to the 4-0 branch yourself, since until RC1
> > backporting requires no sign-offs.
>
> I have no idea how to do this. Is there somewhere a howto?

Well, since we simply use git's cherry-pick command directly, any sort 
of a git howto article that you can get from Google would do.

It's actually pretty simple.  What you have to do is

on master
run "git pull -r" (to get your patch from the remote server)

run "git log" and copy the hash value of your commit which in this case is

91a9b1f163fb698a0fae657b7cc6f60a617c5760

If you haven't created your own 4-0 branch, do so by

git checkout -b libreoffice-4-0 origin/libreoffice-4-0

once you are in the 4-0 branch, run

git cherry-pick 91a9b1f163fb698a0fae657b7cc6f60a617c5760

when down, push to the origin via

git push origin

or if you prefer to run it by gerrit again, run

git push origin HEAD:refs/for/libreoffice-4-0

Hopefully I haven't missed any steps.

Kohei


Or do I
> need to download and compile the 4.0-branch myself?

Normally we'd appreciate at least a casual build test. But in this case, 
since your change is pretty simple, you can simply cherry-pick it if 
building the 4-0 branch takes hours of your time.

Anyway, I just cherry-picked this for you. Maybe you can practice git 
cherry-pick for your next opportunity. :-)

HTH,

Kohei

> - --
> Greetings,
> Rob Snelders
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.11 (GNU/Linux)
> Comment: Using GnuPG with undefined - http://www.enigmail.net/
>
> iQEcBAEBAgAGBQJQ0OenAAoJEGs78UIq7mKyCLcH/0Nysif9xNRBvK5PuBCTCWsa
> lNgpX2niClJ97dt9J5t1OrrPVYApZxnBLSnostFbKeqoeGTJG6r/kCvZRpJUM8Lr
> t018QWlmo8OnMRNpqpOe1vVrWqVaGQAE1PcaDwhsMG18iZ4vZnFE7CUA4lHCCW6h
> xDoyljVpMXk4QOaUeTw48u+av2+Byg5U8+bV7fXQ9S7kV9rXCtT/PM0dJMWsHNEp
> me/oxj4sblS1Twnf/CM2Ysm3lPFHxWipDaykFiLbhVMwV895DIMLkE1JQR/vqzJt
> ip48et9KvWwN717J3sGSKBmCcXN71B48IC87zBRnclKjF9HyZ66MFarN84CaOSo=
> =a2jN
> -----END PGP SIGNATURE-----


--
Kohei Yoshida, LibreOffice hacker, Calc