Re: [asterisk-dev] tags on the main branches [was: Re: Minor Release Branches]

2017-12-26 Thread Tzafrir Cohen
On Fri, Dec 22, 2017 at 08:22:09AM -0700, George Joseph wrote: > On Thu, Dec 21, 2017 at 1:44 PM, Corey Farrell wrote: > > > George asked that I post some scenarios where this would be useful. > > 1. You are about to create updated asterisk package and want to quickly > > scan

Re: [asterisk-dev] tags on the main branches [was: Re: Minor Release Branches]

2017-12-26 Thread George Joseph
On Fri, Dec 22, 2017 at 11:01 AM, Corey Farrell wrote: > On 12/22/2017 12:36 PM, George Joseph wrote: > > > > On Fri, Dec 22, 2017 at 9:50 AM, Corey Farrell wrote: > >> On 12/22/2017 10:22 AM, George Joseph wrote: >> >> >> >> On Thu, Dec 21, 2017 at 1:44 PM,

Re: [asterisk-dev] tags on the main branches [was: Re: Minor Release Branches]

2017-12-22 Thread Corey Farrell
On 12/22/2017 12:36 PM, George Joseph wrote: On Fri, Dec 22, 2017 at 9:50 AM, Corey Farrell > wrote: On 12/22/2017 10:22 AM, George Joseph wrote: On Thu, Dec 21, 2017 at 1:44 PM, Corey Farrell >

Re: [asterisk-dev] tags on the main branches [was: Re: Minor Release Branches]

2017-12-22 Thread George Joseph
On Fri, Dec 22, 2017 at 9:50 AM, Corey Farrell wrote: > On 12/22/2017 10:22 AM, George Joseph wrote: > > > > On Thu, Dec 21, 2017 at 1:44 PM, Corey Farrell wrote: > >> George asked that I post some scenarios where this would be useful. >> 1. You are about to

Re: [asterisk-dev] tags on the main branches [was: Re: Minor Release Branches]

2017-12-22 Thread Corey Farrell
On 12/22/2017 10:22 AM, George Joseph wrote: On Thu, Dec 21, 2017 at 1:44 PM, Corey Farrell > wrote: George asked that I post some scenarios where this would be useful. 1. You are about to create updated asterisk package and want to

Re: [asterisk-dev] tags on the main branches [was: Re: Minor Release Branches]

2017-12-22 Thread George Joseph
On Thu, Dec 21, 2017 at 1:44 PM, Corey Farrell wrote: > George asked that I post some scenarios where this would be useful. > 1. You are about to create updated asterisk package and want to quickly > scan the changes to 13 since latest 13.x.0 release to see if anything is a >

Re: [asterisk-dev] tags on the main branches [was: Re: Minor Release Branches]

2017-12-21 Thread Corey Farrell
George asked that I post some scenarios where this would be useful. 1. You are about to create updated asterisk package and want to quickly scan the changes to 13 since latest 13.x.0 release to see if anything is a 'must patch' for your deployments.  You can use 'tig' to review changes for

Re: [asterisk-dev] tags on the main branches [was: Re: Minor Release Branches]

2017-12-21 Thread Corey Farrell
I just read `git help merge` again and I think the solution is 'git checkout 13 && git merge --strategy ours 13.19.0-rc1'.  This would effectively tell git that '13' already contains 13.19.0-rc1, but without actually trying to pull any changes to 13.  This merge would be the final step of

Re: [asterisk-dev] tags on the main branches [was: Re: Minor Release Branches]

2017-12-21 Thread George Joseph
On Wed, Dec 20, 2017 at 3:14 PM, Corey Farrell wrote: > One thing that might improve this is if releases were merged back to the > major branch. Currently the commit "Update for 13.19.0-rc1" is on the > 13.19 branch and tagged as 13.19.0-rc1. I believe that if we added 'git >

Re: [asterisk-dev] tags on the main branches [was: Re: Minor Release Branches]

2017-12-20 Thread Corey Farrell
One thing that might improve this is if releases were merged back to the major branch.  Currently the commit "Update for 13.19.0-rc1" is on the 13.19 branch and tagged as 13.19.0-rc1.  I believe that if we added 'git checkout 13 && git merge 13.19.0-rc1' we would get better information from

Re: [asterisk-dev] tags on the main branches [was: Re: Minor Release Branches]

2017-12-20 Thread George Joseph
On Wed, Dec 20, 2017 at 8:14 AM, Tzafrir Cohen wrote: > On Wed, Dec 20, 2017 at 07:50:03AM -0700, George Joseph wrote: > > On Wed, Dec 20, 2017 at 2:44 AM, Tzafrir Cohen > > > wrote: > > > > > Off-topic: > > > > > > On Tue, Dec 19, 2017 at

Re: [asterisk-dev] tags on the main branches [was: Re: Minor Release Branches]

2017-12-20 Thread Tzafrir Cohen
On Wed, Dec 20, 2017 at 07:50:03AM -0700, George Joseph wrote: > On Wed, Dec 20, 2017 at 2:44 AM, Tzafrir Cohen > wrote: > > > Off-topic: > > > > On Tue, Dec 19, 2017 at 01:50:03PM -0700, George Joseph wrote: > > > > > Thankfully we tag EVERYTHING! :) > > > >

Re: [asterisk-dev] tags on the main branches [was: Re: Minor Release Branches]

2017-12-20 Thread George Joseph
On Wed, Dec 20, 2017 at 2:44 AM, Tzafrir Cohen wrote: > Off-topic: > > On Tue, Dec 19, 2017 at 01:50:03PM -0700, George Joseph wrote: > > > Thankfully we tag EVERYTHING! :) > > asterisk(13)$ git describe > 13.15.0-rc1-908-ge31e3b581b > > asterisk(14)$ git describe >

[asterisk-dev] tags on the main branches [was: Re: Minor Release Branches]

2017-12-20 Thread Tzafrir Cohen
Off-topic: On Tue, Dec 19, 2017 at 01:50:03PM -0700, George Joseph wrote: > Thankfully we tag EVERYTHING! :) asterisk(13)$ git describe 13.15.0-rc1-908-ge31e3b581b asterisk(14)$ git describe fatal: No tags can describe 'fb18797ae09a685ec71101499fb1c1c606b16397'. Try --always, or create some