Hi,

can you explain - for some time already git pull reports tha
already up-to-date
I tried eveything, also cloning the repository again:

git clone git://git.code.sf.net/p/csound/csound6-git csound-csound6-git

But the last commit show is from august:

commit e93e876328aba3e73f717d3c3601cf4dae5f3acc
Author: John ffitch 
Date:   Thu Aug 29 19:17:00 2013 +0100

    new lenarray version



The .git/config looks

[core]
	repositoryformatversion = 0
	filemode = true
	bare = false
	logallrefupdates = true
[remote "origin"]
	url = git://git.code.sf.net/p/csound/csound6-git
	fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
	remote = origin
	merge = refs/heads/master


and .git/HEAD
ref: refs/heads/master


??

thanks,

tarmo

Thank you!

git checkout origin/develop

did the trick.

tarmo

On Tuesday 24 September 2013 05:12:42 Justin Smith wrote:

try

git branch -r

to see what upstream branches exist. Each of those can be checked out, one of them is likely active. A common convention is for master (your default) to only be updated when an official release is cut.

On Tue, Sep 24, 2013 at 5:03 AM, Tarmo Johannes <tarmo.johannes@otsakool.edu.ee> wrote:

Hi,

can you explain - for some time already git pull reports tha
already up-to-date
I tried eveything, also cloning the repository again:

git clone git://git.code.sf.net/p/csound/csound6-git csound-csound6-git

But the last commit show is from august:

commit e93e876328aba3e73f717d3c3601cf4dae5f3acc
Author: John ffitch <jpff@cs.bath.ac.uk>
Date:   Thu Aug 29 19:17:00 2013 +0100

    new lenarray version



The .git/config looks

[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        url = git://git.code.sf.net/p/csound/csound6-git
        fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
        remote = origin
        merge = refs/heads/master


and .git/HEAD
ref: refs/heads/master


??

thanks,

tarmo


Send bugs reports to the Sourceforge bug trackers
csound6:
            https://sourceforge.net/p/csound/tickets/
csound5:
            https://sourceforge.net/p/csound/bugs/
Discussions of bugs and features can be posted here
To unsubscribe, send email sympa@lists.bath.ac.uk with body "unsubscribe csound"

Changes mainly in develop branch?



> Hi,
>
> can you explain - for some time already git pull reports tha
> already up-to-date
> I tried eveything, also cloning the repository again:
>
> git clone git://git.code.sf.net/p/csound/csound6-git csound-csound6-git
>
> But the last commit show is from august:
>
> commit e93e876328aba3e73f717d3c3601cf4dae5f3acc
> Author: John ffitch 
> Date:   Thu Aug 29 19:17:00 2013 +0100
>
>     new lenarray version
>
>
>
> The .git/config looks
>
> [core]
> 	repositoryformatversion = 0
> 	filemode = true
> 	bare = false
> 	logallrefupdates = true
> [remote "origin"]
> 	url = git://git.code.sf.net/p/csound/csound6-git
> 	fetch = +refs/heads/*:refs/remotes/origin/*
> [branch "master"]
> 	remote = origin
> 	merge = refs/heads/master
>
>
> and .git/HEAD
> ref: refs/heads/master
>
>
> ??
>
> thanks,
>
> tarmo
>
>
> Send bugs reports to the Sourceforge bug trackers
> csound6:
>             https://sourceforge.net/p/csound/tickets/
> csound5:
>             https://sourceforge.net/p/csound/bugs/
> Discussions of bugs and features can be posted here
> To unsubscribe, send email sympa@lists.bath.ac.uk with body "unsubscribe
> csound"
>
>
>
>
>

Thanks for pointing to the Steven's thread, Richard,

it made it now much celare.

If it helps othere, in fact I hda to do:

git branch develop remotes/origin/develop

git checkout develop

to enjoy the latest improvements again.

tarmo

On Tuesday 24 September 2013 14:40:37 Richard Henninger wrote:

I’m just getting into the team’s workflow, but I believe, because “git-flow” is the Version Control process that the csound6 team is now using, that what Tarmo encountered shows the system working as it should.  The main point of the workflow is to minimize ”whack-a-mole” grief from hasty code introductions into a canonical release version. 

If I understand the methodology correctly, the origin/master branch only contains released code and would only change as a result of subsequent official releases such as the 6.00.2 release likely being released early next month.

There could be a “hotfix” branch in the methodology, but none has occurred yet for csound6.

As john succinctly points out, work leading to later release (for merging into 6.00.2 soon) occurs in a “develop” branch until vetted for rejoining the master branch as part of such a release.  To test changes in advance of a release, you get source code, as you found, with “git checkout origin/develop”.

Sub-projects can branch off of “develop” so they can be worked on in their own timeframe without disturbing the “develop” code stream until they are vetted for even that.  These are ultimately merged when ready into the “develop” branch in advance of “develop” being merged into “master” as a release.  Using git, you can change your code to match whichever branch you are interested in testing or working on as needed.

 A while back Steven Yi described the process and provided some basic links that clarify process some:  http://csound.1045644.n5.nabble.com/New-Git-Flow-based-workflow-for-Csound6-td5726363.html

Also, here is a pretty good explanation: http://yakiloo.com/getting-started-git-flow/

It, with automated testing introduced with csound6, seems like a pretty sane way to keep an actively used, complex project like csound from having periods of uncertainty in its mainline code sets.

Richard Henninger
richard@rghmusic.com

From: jpff@cs.bath.ac.uk
Sent: ‎Tuesday‎, ‎September‎ ‎24‎, ‎2013 ‎8‎:‎45‎ ‎AM
To: csound@lists.bath.ac.uk

  Changes mainly in develop branch?



> Hi,
>
> can you explain - for some time already git pull reports tha
> already up-to-date
> I tried eveything, also cloning the repository again:
>
> git clone git://git.code.sf.net/p/csound/csound6-git csound-csound6-git
>
> But the last commit show is from august:
>
> commit e93e876328aba3e73f717d3c3601cf4dae5f3acc
> Author: John ffitch <jpff@cs.bath.ac.uk>
> Date:   Thu Aug 29 19:17:00 2013 +0100
>
>     new lenarray version
>
>
>
> The .git/config looks
>
> [core]
>  repositoryformatversion = 0
>  filemode = true
>  bare = false
>  logallrefupdates = true
> [remote "origin"]
>  url = git://git.code.sf.net/p/csound/csound6-git
>  fetch = +refs/heads/*:refs/remotes/origin/*
> [branch "master"]
>  remote = origin
>  merge = refs/heads/master
>
>
> and .git/HEAD
> ref: refs/heads/master
>
>
> ??
>
> thanks,
>
> tarmo
>
>
> Send bugs reports to the Sourceforge bug trackers
> csound6:
>             https://sourceforge.net/p/csound/tickets/
> csound5:
>             https://sourceforge.net/p/csound/bugs/
> Discussions of bugs and features can be posted here
> To unsubscribe, send email sympa@lists.bath.ac.uk with body "unsubscribe
> csound"
>
>
>
>
>




Send bugs reports to the Sourceforge bug trackers
csound6:
            https://sourceforge.net/p/csound/tickets/
csound5:
            https://sourceforge.net/p/csound/bugs/
Discussions of bugs and features can be posted here
To unsubscribe, send email sympa@lists.bath.ac.uk with body "unsubscribe csound"