1.3.x branch

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

1.3.x branch

Luigi Ballabio
Hi all,
    I've just created a "R01030x-branch" branch for the upcoming 1.3 release.
If you want to submit bug fixes to be included, please work off that
branch. As usual, new features should be developed off the master
branch.

Thanks,
    Luigi

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
QuantLib-users mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/quantlib-users
Reply | Threaded
Open this post in threaded view
|

Re: 1.3.x branch

Peter Caspers-4
Luigi, please, could you advise what is the best way to get the new branch into own repositories forked
from yours before ?  Would the following be correct and safe:
 
git checkout vendor
 
(where vendor is the master branch in your repo, ideally on the same version as when you created
the R01030 branch, but possibly older)
 
git branch R01030
 
git pull official R01030
 
(where official is your repo)
Thank you
  Peter
On 13 June 2013 16:39, Luigi Ballabio <[hidden email]> wrote:
Hi all,
    I've just created a "R01030x-branch" branch for the upcoming 1.3 release.
If you want to submit bug fixes to be included, please work off that
branch. As usual, new features should be developed off the master
branch.

Thanks,
    Luigi

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
QuantLib-users mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/quantlib-users


------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
QuantLib-users mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/quantlib-users
Reply | Threaded
Open this post in threaded view
|

Re: 1.3.x branch

Luigi Ballabio
Hi Peter,
    the way I'd do is:
1) set up a remote pointing to my repo, as explained in
<https://help.github.com/articles/fork-a-repo>, "Step 3: Configure
remotes".  After doing this, if you run "git branch -r" you should see
upstream/R01030x-branch among your remote branches.
2) create a branch from my 1.3 branch; the command is simply
    git branch R01030x-branch upstream/R01030x-branch
(if you used "upstream"; you can use "official" just as well)
After you've done it, you can push it to your repo with
    git push origin R01030x-branch
(assuming that you call "origin" your repo).
3) When you want to get the changes from the official repo into your
repo, follow the instructions in the page I linked above, "Pull in
upstream changes". They work for master as for any other branch.

Hope this helps,
    Luigi


On Thu, Jun 13, 2013 at 6:07 PM, Peter Caspers <[hidden email]> wrote:

> Luigi, please, could you advise what is the best way to get the new branch
> into own repositories forked
> from yours before ?  Would the following be correct and safe:
>
> git checkout vendor
>
> (where vendor is the master branch in your repo, ideally on the same version
> as when you created
> the R01030 branch, but possibly older)
>
> git branch R01030
>
> git pull official R01030
>
> (where official is your repo)
> Thank you
>   Peter
> On 13 June 2013 16:39, Luigi Ballabio <[hidden email]> wrote:
>>
>> Hi all,
>>     I've just created a "R01030x-branch" branch for the upcoming 1.3
>> release.
>> If you want to submit bug fixes to be included, please work off that
>> branch. As usual, new features should be developed off the master
>> branch.
>>
>> Thanks,
>>     Luigi
>>
>>
>> ------------------------------------------------------------------------------
>> This SF.net email is sponsored by Windows:
>>
>> Build for Windows Store.
>>
>> http://p.sf.net/sfu/windows-dev2dev
>> _______________________________________________
>> QuantLib-users mailing list
>> [hidden email]
>> https://lists.sourceforge.net/lists/listinfo/quantlib-users
>
>

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
QuantLib-users mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/quantlib-users
Reply | Threaded
Open this post in threaded view
|

Re: 1.3.x branch

Peter Caspers-4
that works fine, thank you
  Peter

Luigi Ballabio <[hidden email]> writes:

> Hi Peter,
>     the way I'd do is:
> 1) set up a remote pointing to my repo, as explained in
> <https://help.github.com/articles/fork-a-repo>, "Step 3: Configure
> remotes".  After doing this, if you run "git branch -r" you should see
> upstream/R01030x-branch among your remote branches.
> 2) create a branch from my 1.3 branch; the command is simply
>     git branch R01030x-branch upstream/R01030x-branch
> (if you used "upstream"; you can use "official" just as well)
> After you've done it, you can push it to your repo with
>     git push origin R01030x-branch
> (assuming that you call "origin" your repo).
> 3) When you want to get the changes from the official repo into your
> repo, follow the instructions in the page I linked above, "Pull in
> upstream changes". They work for master as for any other branch.
>
> Hope this helps,
>     Luigi
>
>
> On Thu, Jun 13, 2013 at 6:07 PM, Peter Caspers <[hidden email]> wrote:
>> Luigi, please, could you advise what is the best way to get the new branch
>> into own repositories forked
>> from yours before ?  Would the following be correct and safe:
>>
>> git checkout vendor
>>
>> (where vendor is the master branch in your repo, ideally on the same version
>> as when you created
>> the R01030 branch, but possibly older)
>>
>> git branch R01030
>>
>> git pull official R01030
>>
>> (where official is your repo)
>> Thank you
>>   Peter
>> On 13 June 2013 16:39, Luigi Ballabio <[hidden email]> wrote:
>>>
>>> Hi all,
>>>     I've just created a "R01030x-branch" branch for the upcoming 1.3
>>> release.
>>> If you want to submit bug fixes to be included, please work off that
>>> branch. As usual, new features should be developed off the master
>>> branch.
>>>
>>> Thanks,
>>>     Luigi
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> This SF.net email is sponsored by Windows:
>>>
>>> Build for Windows Store.
>>>
>>> http://p.sf.net/sfu/windows-dev2dev
>>> _______________________________________________
>>> QuantLib-users mailing list
>>> [hidden email]
>>> https://lists.sourceforge.net/lists/listinfo/quantlib-users
>>
>>

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
QuantLib-users mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/quantlib-users