[Cs-dev] Direct Commit was made to Master

[Cs-dev] Direct Commit was made to Master

Date	2013-08-08 00:19
From	Steven Yi
Subject	[Cs-dev] Direct Commit was made to Master
	Hi All, A commit was made to master and there really shouldn't be any done, only merges. As the same change was done to develop, I've removed that commit and pushed the revised master to sourceforge. I'm not sure what will happen for those who have already pulled master. If you experience problems, reply here. Thanks, steven ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite! It's a free troubleshooting tool designed for production. Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk _______________________________________________ Csound-devel mailing list Csound-devel@lists.sourceforge.net

Date	2013-08-08 00:28
From	Victor Lazzarini
Subject	Re: [Cs-dev] Direct Commit was made to Master
	It could have been me. The first time I committed to develop and pushed from that branch, git tried to commit to both develop and master (I don't know why), and it failed to commit to master (with the message about fast-forward etc). To stop having these messages every time I pushed, I moved to master, pulled and then pushed. Then I checked out develop again and have carried on committing there. I don't know why git tried to push on both branches. Maybe I had some earlier commits in the master which I was not aware of and that I had not pushed. Victor On 8 Aug 2013, at 00:19, Steven Yi wrote: > Hi All, > > A commit was made to master and there really shouldn't be any done, > only merges. As the same change was done to develop, I've removed > that commit and pushed the revised master to sourceforge. I'm not > sure what will happen for those who have already pulled master. If > you experience problems, reply here. > > Thanks, > steven > > ------------------------------------------------------------------------------ > Get 100% visibility into Java/.NET code with AppDynamics Lite! > It's a free troubleshooting tool designed for production. > Get down to code-level detail for bottlenecks, with <2% overhead. > Download for free and get started troubleshooting in minutes. > http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk > _______________________________________________ > Csound-devel mailing list > Csound-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/csound-devel Dr Victor Lazzarini Senior Lecturer Dept. of Music NUI Maynooth Ireland tel.: +353 1 708 3545 Victor dot Lazzarini AT nuim dot ie ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite! It's a free troubleshooting tool designed for production. Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk _______________________________________________ Csound-devel mailing list Csound-devel@lists.sourceforge.net

Date	2013-08-08 00:34
From	Felipe Sateler
Subject	Re: [Cs-dev] Direct Commit was made to Master
	You should instruct git to only push the current branch to its remote tracking branch: git config push.default upstream The default is to push all branches that have a remote tracking branch. On Wed, Aug 7, 2013 at 7:28 PM, Victor Lazzarini wrote: > It could have been me. The first time I committed to develop and pushed from that branch, git tried to commit to both develop and > master (I don't know why), and it failed to commit to master (with the message about fast-forward etc). To stop having these messages > every time I pushed, I moved to master, pulled and then pushed. Then I checked out develop again and have carried on committing > there. > > I don't know why git tried to push on both branches. Maybe I had some earlier commits in the master which I was not aware of and > that I had not pushed. > > Victor > On 8 Aug 2013, at 00:19, Steven Yi wrote: > >> Hi All, >> >> A commit was made to master and there really shouldn't be any done, >> only merges. As the same change was done to develop, I've removed >> that commit and pushed the revised master to sourceforge. I'm not >> sure what will happen for those who have already pulled master. If >> you experience problems, reply here. >> >> Thanks, >> steven >> >> ------------------------------------------------------------------------------ >> Get 100% visibility into Java/.NET code with AppDynamics Lite! >> It's a free troubleshooting tool designed for production. >> Get down to code-level detail for bottlenecks, with <2% overhead. >> Download for free and get started troubleshooting in minutes. >> http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk >> _______________________________________________ >> Csound-devel mailing list >> Csound-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/csound-devel > > Dr Victor Lazzarini > Senior Lecturer > Dept. of Music > NUI Maynooth Ireland > tel.: +353 1 708 3545 > Victor dot Lazzarini AT nuim dot ie > > > > > ------------------------------------------------------------------------------ > Get 100% visibility into Java/.NET code with AppDynamics Lite! > It's a free troubleshooting tool designed for production. > Get down to code-level detail for bottlenecks, with <2% overhead. > Download for free and get started troubleshooting in minutes. > http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk > _______________________________________________ > Csound-devel mailing list > Csound-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/csound-devel -- Saludos, Felipe Sateler ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite! It's a free troubleshooting tool designed for production. Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk _______________________________________________ Csound-devel mailing list Csound-devel@lists.sourceforge.net

Date	2013-08-08 00:41
From	Steven Yi
Subject	Re: [Cs-dev] Direct Commit was made to Master
	It's also worth noting that the default push.default will be "simple" in git 2.0, which I think is like the current "upstream". Just to note, I have this set in my ~/.gitconfig: [push] default = current (current is similar to upstream but pushes to remote branch of same name). "man git-config" has more information about various git configuration settings. On Thu, Aug 8, 2013 at 1:34 AM, Felipe Sateler wrote: > You should instruct git to only push the current branch to its remote > tracking branch: > > git config push.default upstream > > The default is to push all branches that have a remote tracking branch. > > On Wed, Aug 7, 2013 at 7:28 PM, Victor Lazzarini > wrote: >> It could have been me. The first time I committed to develop and pushed from that branch, git tried to commit to both develop and >> master (I don't know why), and it failed to commit to master (with the message about fast-forward etc). To stop having these messages >> every time I pushed, I moved to master, pulled and then pushed. Then I checked out develop again and have carried on committing >> there. >> >> I don't know why git tried to push on both branches. Maybe I had some earlier commits in the master which I was not aware of and >> that I had not pushed. >> >> Victor >> On 8 Aug 2013, at 00:19, Steven Yi wrote: >> >>> Hi All, >>> >>> A commit was made to master and there really shouldn't be any done, >>> only merges. As the same change was done to develop, I've removed >>> that commit and pushed the revised master to sourceforge. I'm not >>> sure what will happen for those who have already pulled master. If >>> you experience problems, reply here. >>> >>> Thanks, >>> steven >>> >>> ------------------------------------------------------------------------------ >>> Get 100% visibility into Java/.NET code with AppDynamics Lite! >>> It's a free troubleshooting tool designed for production. >>> Get down to code-level detail for bottlenecks, with <2% overhead. >>> Download for free and get started troubleshooting in minutes. >>> http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk >>> _______________________________________________ >>> Csound-devel mailing list >>> Csound-devel@lists.sourceforge.net >>> https://lists.sourceforge.net/lists/listinfo/csound-devel >> >> Dr Victor Lazzarini >> Senior Lecturer >> Dept. of Music >> NUI Maynooth Ireland >> tel.: +353 1 708 3545 >> Victor dot Lazzarini AT nuim dot ie >> >> >> >> >> ------------------------------------------------------------------------------ >> Get 100% visibility into Java/.NET code with AppDynamics Lite! >> It's a free troubleshooting tool designed for production. >> Get down to code-level detail for bottlenecks, with <2% overhead. >> Download for free and get started troubleshooting in minutes. >> http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk >> _______________________________________________ >> Csound-devel mailing list >> Csound-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/csound-devel > > > > -- > > Saludos, > Felipe Sateler > > ------------------------------------------------------------------------------ > Get 100% visibility into Java/.NET code with AppDynamics Lite! > It's a free troubleshooting tool designed for production. > Get down to code-level detail for bottlenecks, with <2% overhead. > Download for free and get started troubleshooting in minutes. > http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk > _______________________________________________ > Csound-devel mailing list > Csound-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/csound-devel ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite! It's a free troubleshooting tool designed for production. Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk _______________________________________________ Csound-devel mailing list Csound-devel@lists.sourceforge.net

Date	2013-08-08 00:43
From	Steven Yi
Subject	Re: [Cs-dev] Direct Commit was made to Master
	I thought I'd mention, I'm sure this may happen again that a commit gets pushed to master. I'm assuming the git rebase I did worked out alright, but want to make sure there's no adverse effects. That said, it's odd that the commit would be on both master and the develop there. If Felipe's suggestion works out, awesome, if not, we can triage from there. On Thu, Aug 8, 2013 at 1:28 AM, Victor Lazzarini wrote: > It could have been me. The first time I committed to develop and pushed from that branch, git tried to commit to both develop and > master (I don't know why), and it failed to commit to master (with the message about fast-forward etc). To stop having these messages > every time I pushed, I moved to master, pulled and then pushed. Then I checked out develop again and have carried on committing > there. > > I don't know why git tried to push on both branches. Maybe I had some earlier commits in the master which I was not aware of and > that I had not pushed. > > Victor > On 8 Aug 2013, at 00:19, Steven Yi wrote: > >> Hi All, >> >> A commit was made to master and there really shouldn't be any done, >> only merges. As the same change was done to develop, I've removed >> that commit and pushed the revised master to sourceforge. I'm not >> sure what will happen for those who have already pulled master. If >> you experience problems, reply here. >> >> Thanks, >> steven >> >> ------------------------------------------------------------------------------ >> Get 100% visibility into Java/.NET code with AppDynamics Lite! >> It's a free troubleshooting tool designed for production. >> Get down to code-level detail for bottlenecks, with <2% overhead. >> Download for free and get started troubleshooting in minutes. >> http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk >> _______________________________________________ >> Csound-devel mailing list >> Csound-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/csound-devel > > Dr Victor Lazzarini > Senior Lecturer > Dept. of Music > NUI Maynooth Ireland > tel.: +353 1 708 3545 > Victor dot Lazzarini AT nuim dot ie > > > > > ------------------------------------------------------------------------------ > Get 100% visibility into Java/.NET code with AppDynamics Lite! > It's a free troubleshooting tool designed for production. > Get down to code-level detail for bottlenecks, with <2% overhead. > Download for free and get started troubleshooting in minutes. > http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk > _______________________________________________ > Csound-devel mailing list > Csound-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/csound-devel ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite! It's a free troubleshooting tool designed for production. Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk _______________________________________________ Csound-devel mailing list Csound-devel@lists.sourceforge.net

Date	2013-08-08 01:13
From	Victor Lazzarini
Subject	Re: [Cs-dev] Direct Commit was made to Master
	OK, done it. It looks like it's only committing the current branch. On 8 Aug 2013, at 00:34, Felipe Sateler wrote: > You should instruct git to only push the current branch to its remote > tracking branch: > > git config push.default upstream > > The default is to push all branches that have a remote tracking branch. > > On Wed, Aug 7, 2013 at 7:28 PM, Victor Lazzarini > wrote: >> It could have been me. The first time I committed to develop and pushed from that branch, git tried to commit to both develop and >> master (I don't know why), and it failed to commit to master (with the message about fast-forward etc). To stop having these messages >> every time I pushed, I moved to master, pulled and then pushed. Then I checked out develop again and have carried on committing >> there. >> >> I don't know why git tried to push on both branches. Maybe I had some earlier commits in the master which I was not aware of and >> that I had not pushed. >> >> Victor >> On 8 Aug 2013, at 00:19, Steven Yi wrote: >> >>> Hi All, >>> >>> A commit was made to master and there really shouldn't be any done, >>> only merges. As the same change was done to develop, I've removed >>> that commit and pushed the revised master to sourceforge. I'm not >>> sure what will happen for those who have already pulled master. If >>> you experience problems, reply here. >>> >>> Thanks, >>> steven >>> >>> ------------------------------------------------------------------------------ >>> Get 100% visibility into Java/.NET code with AppDynamics Lite! >>> It's a free troubleshooting tool designed for production. >>> Get down to code-level detail for bottlenecks, with <2% overhead. >>> Download for free and get started troubleshooting in minutes. >>> http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk >>> _______________________________________________ >>> Csound-devel mailing list >>> Csound-devel@lists.sourceforge.net >>> https://lists.sourceforge.net/lists/listinfo/csound-devel >> >> Dr Victor Lazzarini >> Senior Lecturer >> Dept. of Music >> NUI Maynooth Ireland >> tel.: +353 1 708 3545 >> Victor dot Lazzarini AT nuim dot ie >> >> >> >> >> ------------------------------------------------------------------------------ >> Get 100% visibility into Java/.NET code with AppDynamics Lite! >> It's a free troubleshooting tool designed for production. >> Get down to code-level detail for bottlenecks, with <2% overhead. >> Download for free and get started troubleshooting in minutes. >> http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk >> _______________________________________________ >> Csound-devel mailing list >> Csound-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/csound-devel > > > > -- > > Saludos, > Felipe Sateler > > ------------------------------------------------------------------------------ > Get 100% visibility into Java/.NET code with AppDynamics Lite! > It's a free troubleshooting tool designed for production. > Get down to code-level detail for bottlenecks, with <2% overhead. > Download for free and get started troubleshooting in minutes. > http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk > _______________________________________________ > Csound-devel mailing list > Csound-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/csound-devel Dr Victor Lazzarini Senior Lecturer Dept. of Music NUI Maynooth Ireland tel.: +353 1 708 3545 Victor dot Lazzarini AT nuim dot ie ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite! It's a free troubleshooting tool designed for production. Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk _______________________________________________ Csound-devel mailing list Csound-devel@lists.sourceforge.net