[GIT] 4.3.0 vs 4.3.0-forward - where to commit?

2014-06-04 Thread ilya musayev
Looks like few patches that i've backported to 4.3.0-forward have been dropped (dont see my commits). i am now under impression i should have commited to 4.3.0 branch. Would someone please clarify the difference between the two and where to commit when i need to backport/cherry-pick a patch?

Re: [GIT] 4.3.0 vs 4.3.0-forward - where to commit?

2014-06-04 Thread sebgoa
On Jun 5, 2014, at 8:14 AM, ilya musayev wrote: > Looks like few patches that i've backported to 4.3.0-forward have been > dropped (dont see my commits). i am now under impression i should have > commited to 4.3.0 branch. > > Would someone please clarify the difference between the two and whe

Re: [GIT] 4.3.0 vs 4.3.0-forward - where to commit?

2014-06-05 Thread Daan Hoogland
a forward branch is only valid during code freeze. In fact you could use your own branch to keep track off your changes during code freeze and rebase that on the release branch. After release the release branch is once again open territory and you can commit to it. I am not sure this way of working

RE: [GIT] 4.3.0 vs 4.3.0-forward - where to commit?

2014-06-05 Thread Alex Hitchins
3 587 -Original Message- From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] Sent: 05 June 2014 08:09 To: dev Subject: Re: [GIT] 4.3.0 vs 4.3.0-forward - where to commit? a forward branch is only valid during code freeze. In fact you could use your own branch to keep track off your ch

Re: [GIT] 4.3.0 vs 4.3.0-forward - where to commit?

2014-06-05 Thread Daan Hoogland
> From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] > Sent: 05 June 2014 08:09 > To: dev > Subject: Re: [GIT] 4.3.0 vs 4.3.0-forward - where to commit? > > a forward branch is only valid during code freeze. In fact you could use your > own branch to keep track off your c

RE: [GIT] 4.3.0 vs 4.3.0-forward - where to commit?

2014-06-05 Thread Animesh Chaturvedi
> -Original Message- > From: sebgoa [mailto:run...@gmail.com] > Sent: Wednesday, June 04, 2014 11:17 PM > To: dev@cloudstack.apache.org > Subject: Re: [GIT] 4.3.0 vs 4.3.0-forward - where to commit? > > > On Jun 5, 2014, at 8:14 AM, ilya musayev wrote: >

Re: [GIT] 4.3.0 vs 4.3.0-forward - where to commit?

2014-06-05 Thread sebgoa
On Jun 5, 2014, at 9:00 PM, Animesh Chaturvedi wrote: > > >> -Original Message- >> From: sebgoa [mailto:run...@gmail.com] >> Sent: Wednesday, June 04, 2014 11:17 PM >> To: dev@cloudstack.apache.org >> Subject: Re: [GIT] 4.3.0 vs 4.3.0-forward -

Re: [GIT] 4.3.0 vs 4.3.0-forward - where to commit?

2014-06-05 Thread ilya musayev
Subject: Re: [GIT] 4.3.0 vs 4.3.0-forward - where to commit? On Jun 5, 2014, at 8:14 AM, ilya musayev wrote: Looks like few patches that i've backported to 4.3.0-forward have been dropped (dont see my commits). i am now under impression i should have commited to 4.3.0 branch. Would so

RE: [GIT] 4.3.0 vs 4.3.0-forward - where to commit?

2014-06-05 Thread Animesh Chaturvedi
> > [Animesh] Edison had merged 4.3-forward into 4.3 yesterday and I > > deleted 4.3-forward branch this morning > > > > So was there a lot of bug fixes that went in 4.3 during the merge ? if yes we > might want to release a 4.3.1 ? [Animesh] yes there were around 170 commits that came in with t