Re: Switching to 4.0 Branch

2013-02-20 Thread Miklos Vajna
Hi Joel,

 I've made a couple simple patches for 4.1 master but see no reason
 why they can't be in 4.0.1 when it's released. How do I go about
 changing branch and then resubmitting patch for 4.0 (and then of
 course go back to 4.1 master).

Once they are in master, you can do:

git log # note the sha1 of the commits you want to submit to 4-0
git branch libreoffice-4-0 origin/libreoffice-4-0 # create the branch, possibly 
you need logerrit/, not origin/
git checkout libreoffice-4-0
git cherry-pick -x sha1 # for each change
# build and runtime-test
git push libreoffice-4-0:refs/for/libreoffice-4-0
git checkout master # go back to master

More here:

https://wiki.documentfoundation.org/Development/gerrit/SubmitPatch

Please make sure you only cherry-pick bugfixes, feature commits should
be master-only.

Hope this helps,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Switching to 4.0 Branch

2013-02-19 Thread Joel Madero

Hi All,

I've made a couple simple patches for 4.1 master but see no reason why 
they can't be in 4.0.1 when it's released. How do I go about changing 
branch and then resubmitting patch for 4.0 (and then of course go back 
to 4.1 master).


Many thanks


Best Regards,
Joel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


RE: Switching to 4.0 Branch

2013-02-19 Thread Jonathan Aquilina
To change branches its usually done by git checkout BRANCH NAME

-Original Message-
From: libreoffice-bounces+eagles051387=gmail@lists.freedesktop.org
[mailto:libreoffice-bounces+eagles051387=gmail@lists.freedesktop.org] On
Behalf Of Joel Madero
Sent: 20 February 2013 02:18
To: libreoffice-dev
Subject: Switching to 4.0 Branch

Hi All,

I've made a couple simple patches for 4.1 master but see no reason why they
can't be in 4.0.1 when it's released. How do I go about changing branch and
then resubmitting patch for 4.0 (and then of course go back to 4.1 master).

Many thanks


Best Regards,
Joel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice