You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@flex.apache.org by Justin Mclean <ju...@classsoftware.com> on 2013/03/18 03:28:19 UTC
Git and revision numbers
Hi,
As far as I can see Git has no check in revision numbers. Currently the build release process uses SVN version number I think the number is appended to the RSLs and may be used elsewhere.
Anyone have any ideas on how to resolve this?
Also how do we identify which GIT check in fixed a JIRA bug? Used to be that we just add the SVN revision checkin but now a push can result in several checkins.
The commit hashes are rather ugly, for instance:
fc57407c78d25a64afce4c12ac759139720f4347 Added pt_PT postcode validator strings
8645f87c26e55f55807e74befaa659b39c9ef93c Added pt_BR postcode validator strings
2d41d857e14a9bce839285c8bb73da801b2c0877 Added ja_JP postcode validator strings
8b9c4a6de050f821a6a3894dbda4f7091be2487c Added de_DE postcode validator strings
Thanks,
Justin
Re: Git and revision numbers
Posted by Frédéric THOMAS <we...@hotmail.com>.
Hi Gordon,
You right that usualy, the short SHA1 id of the commit could be considerated
as unique, the point is elsewhere, I explain, a commit in Git unlike Svn
doesn't identify by force a bugfix or a new feature described in a JIRA
ticket, it can be a set of commits (so called a changeset), so, that's this
changeset that has to be linked to the JIRA ticket, that's where the FishEye
JIRA plugin comes in action, it tracks the Commits until their message
contains the Issue ID and show them up in the source tab of the JIRA isuue.
Am I clear ?
-Fred
-----Message d'origine-----
From: Gordon Smith
Sent: Monday, March 18, 2013 6:16 PM
To: dev@flex.apache.org
Subject: RE: Git and revision numbers
> what can we put in JIRA to show exactly what changes that have occurred
I read that the first 7 characters of the 40-character SHA-1 hash for a
commit are typically used to identify the commit, because they are usually
enough to distinguish it. So we should use these 7 characters as a build
number.
- Gordon
-----Original Message-----
From: Justin Mclean [mailto:justin@classsoftware.com]
Sent: Monday, March 18, 2013 12:58 AM
To: dev@flex.apache.org
Subject: Re: Git and revision numbers
Hi,
> You can check writing the JIRA ticket id in the commit message(s), push
> it/them , then go to JIRA, in the source tab, you should see all the
> modified files (if this feature is not broken again).
As far as I know this is not a feature we have - so what can we put in JIRA
to show exactly what changes that have occurred.
Justin
Re: Git and revision numbers
Posted by Dasa Paddock <dp...@esri.com>.
Maybe ant's BuildNumber task could be used:
http://ant.apache.org/manual/Tasks/buildnumber.html
--Dasa
On Mar 18, 2013, at 10:32 AM, Alex Harui <ah...@adobe.com> wrote:
>
>
>
> On 3/18/13 10:16 AM, "Gordon Smith" <go...@adobe.com> wrote:
>
>>> what can we put in JIRA to show exactly what changes that have occurred
>>
>> I read that the first 7 characters of the 40-character SHA-1 hash for a commit
>> are typically used to identify the commit, because they are usually enough to
>> distinguish it. So we should use these 7 characters as a build number.
> I would rather our build numbers be monotonically increasing.
>>
>
> --
> Alex Harui
> Flex SDK Team
> Adobe Systems, Inc.
> http://blogs.adobe.com/aharui
>
>
Re: Git and revision numbers
Posted by Frédéric THOMAS <we...@hotmail.com>.
Oups, sorry guys I misread, I was out of subject, I thought you was talking
about the bidirectional commits/JIRA links.
-Fred
-----Message d'origine-----
From: Alex Harui
Sent: Monday, March 18, 2013 6:32 PM
To: dev@flex.apache.org
Subject: Re: Git and revision numbers
On 3/18/13 10:16 AM, "Gordon Smith" <go...@adobe.com> wrote:
>> what can we put in JIRA to show exactly what changes that have occurred
>
> I read that the first 7 characters of the 40-character SHA-1 hash for a
> commit
> are typically used to identify the commit, because they are usually enough
> to
> distinguish it. So we should use these 7 characters as a build number.
I would rather our build numbers be monotonically increasing.
>
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
Re: Git and revision numbers
Posted by Alex Harui <ah...@adobe.com>.
On 3/18/13 10:16 AM, "Gordon Smith" <go...@adobe.com> wrote:
>> what can we put in JIRA to show exactly what changes that have occurred
>
> I read that the first 7 characters of the 40-character SHA-1 hash for a commit
> are typically used to identify the commit, because they are usually enough to
> distinguish it. So we should use these 7 characters as a build number.
I would rather our build numbers be monotonically increasing.
>
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
RE: Git and revision numbers
Posted by Gordon Smith <go...@adobe.com>.
> what can we put in JIRA to show exactly what changes that have occurred
I read that the first 7 characters of the 40-character SHA-1 hash for a commit are typically used to identify the commit, because they are usually enough to distinguish it. So we should use these 7 characters as a build number.
- Gordon
-----Original Message-----
From: Justin Mclean [mailto:justin@classsoftware.com]
Sent: Monday, March 18, 2013 12:58 AM
To: dev@flex.apache.org
Subject: Re: Git and revision numbers
Hi,
> You can check writing the JIRA ticket id in the commit message(s), push it/them , then go to JIRA, in the source tab, you should see all the modified files (if this feature is not broken again).
As far as I know this is not a feature we have - so what can we put in JIRA to show exactly what changes that have occurred.
Justin
Re: Git and revision numbers
Posted by Frédéric THOMAS <we...@hotmail.com>.
1) Looking at JIRA ticket, what changes to Git were related
Time ago, Bertrand commented a JIRA ticket [1] to activate FishEye on JIRA
for the Flex project but it has been closed, sending us to Altassian but
nothing has been done on that way, so, I opened a FishEye ticket [2]
following the instructions there [3]
2) Looking at GIT log to see what JIRA issues got fixed (in order to update
release notes or when someone asks if a release contains a fix)
In order to make FishEye to track our commits, the Git log should contain
the JIRA Ticket id, a list of links to the files added to the commit will
then be shown in the JIRA issue under the source tab.
3) Determining if a release contains a particular commit/push
A way could be to have a script to parse JIRA and check what was resolved
since the last release, personaly, I never did it but I know that's
possible.
4) Monotonically increasing build numbers for version checking
> Can we solve #3 and #4 by substituting YYYYMMDD as the build number?
Yes, that's maybe the way to solve #3 and #4
> I saw suggestions that you name branches with the JIRA issue. I assume
> that is because the branch name shows up automatically in the log when
> pushed?
> Otherwise it is just a convention and folks will make mistakes.
In all the middle and big companies I worked for, it was use like that by
convention, it's easier to retreive my branch if I use the JIRA Ticket ID as
I can have several open on several projects, ok, maybe not for Flex :)
> Could we put a URL to the log message or even commit email in the JIRA
> issue?
Until the FishEye issue is not resolved, I guess yes, and we should write
the JIRA id as well in the log of the commit, like that, when resolved,
we'll have an uniform way to see the things, it still to be determinate if
svn and git could work could be tracked by the same FishEye instance, I'll
ask them as soon they'll answer, currently, the status changed to
investigating.
-Fred
[1] https://issues.apache.org/jira/browse/INFRA-5635
[2] https://support.atlassian.com/browse/JST-59433
[3] https://cwiki.apache.org/INFRA/infra-faq.html
-----Message d'origine-----
From: Alex Harui
Sent: Monday, March 18, 2013 4:24 PM
To: dev@flex.apache.org
Subject: Re: Git and revision numbers
Let's stop for a second and identify what problems we are trying to solve.
I think there are actually several. I can think of:
1) Looking at JIRA ticket, what changes to Git were related
2) Looking at GIT log to see what JIRA issues got fixed (in order to update
release notes or when someone asks if a release contains a fix)
3) Determining if a release contains a particular commit/push
4) Monotonically increasing build numbers for version checking
It looks like folks solve #4 by counting commits to master. I guess that's
ok, but doesn't really seem that helpful. Can we solve #3 and #4 by
substituting YYYYMMDD as the build number? I think it solves #2 as well:
you can see if the log shows the JIRA issue before the date decoded from the
build number.
For #1, knowing the hash or partial hash still doesn't give you a sense for
when it happened. I suppose we could use dates here as well to at least
bracket what changes and assuming the log mentions the JIRA issue.
I saw suggestions that you name branches with the JIRA issue. I assume that
is because the branch name shows up automatically in the log when pushed?
Otherwise it is just a convention and folks will make mistakes.
Could we put a URL to the log message or even commit email in the JIRA
issue?
On 3/18/13 2:49 AM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
> Hi Jose,
>
> I thought about the short sha1 too and it could work, I was thinking about
> a
> lightweight tag too (more readable), not sure though what is the best, I
> have to dig into more deeply.
>
> Thanks,
> -Fred
>
> -----Message d'origine-----
> From: Jose Barragan
> Sent: Monday, March 18, 2013 10:37 AM
> To: dev@flex.apache.org
> Subject: Re: Git and revision numbers
>
> In my work, I use the build number of the Hudson, or occasionally the
> short
> version of the commit SHA that I am building.
> Anyway, I leave as you get the short version of the SHA, in GIT
> git log -1 --pretty=format:%h
> --
> Jose Barragan
> Chief Software Architect
> Codeoscopic Madrid
> C/. Infanta Mercedes, 92.
> Planta 5. 505.
> 28020 Madrid.
> Tel.: +34 912 94 80 80
>
> On Mar 18, 2013, at 10:17 AM, Frédéric THOMAS <we...@hotmail.com>
> wrote:
>
>> JIRA use the JIRA Fisheye plugin to link the sources with, aparently,
>> it's
>> not setup for our project, I retreived the infra ticket [1], we can then
>> directly deal with altassian to setup our project with fisheye.
>>
>> From [2] :
>>
>> Support FAQ
>> Can we use Fisheye to browse and search our repository?
>> Yes. See http://fisheye6.atlassian.com/ for some working examples. (Our
>> Jira Fisheye currently disabled, looking into it)
>>
>> The people at Atlassian kindly provide FishEye instances of ASF projects,
>> upon request.
>>
>> First, check with your project's PMC, and then ask Atlassian to setup a
>> FishEye instance for your project. (No need to keep infra the loop.)
>> Create a support request at Atlassian Support in the FishEye project.
>> Please use the "Public Hosting" component for your request.
>> If there is no response after a reasonable amount of time, infra has
>> access to set up projects on Fisheye, but consider this a last resort
>> option, Atlassian should be first point of contact.
>> Atlassian now run a local synced copy of the ASF repository, hence
>> requests can now be made direct without infra needing to be involved.
>>
>> So, I decided to open an issue at Altassian fisheye [3]
>>
>> -Fred
>>
>> [1] https://issues.apache.org/jira/browse/INFRA-5635
>> [2] https://cwiki.apache.org/INFRA/infra-faq.html
>> [3] https://support.atlassian.com/browse/JST-59433
>>
>> -----Message d'origine----- From: Frédéric THOMAS
>> Sent: Monday, March 18, 2013 9:29 AM
>> To: dev@flex.apache.org
>> Subject: Re: Git and revision numbers
>>
>> Who is JIRA admin btw ? it seem the fisheye plugin is there but
>> misconfigured.
>>
>> -Fred
>>
>> -----Message d'origine----- From: Frédéric THOMAS
>> Sent: Monday, March 18, 2013 9:19 AM
>> To: dev@flex.apache.org
>> Subject: Re: Git and revision numbers
>>
>>> That's a feature we have but maybe broken (we should deal with infra
>>> IMO).
>>
>> -Fred
>>
>> -----Message d'origine----- From: Justin Mclean
>> Sent: Monday, March 18, 2013 8:58 AM
>> To: dev@flex.apache.org
>> Subject: Re: Git and revision numbers
>>
>> Hi,
>>
>>> You can check writing the JIRA ticket id in the commit message(s), push
>>> it/them , then go to JIRA, in the source tab, you should see all the
>>> modified files (if this feature is not broken again).
>>
>> As far as I know this is not a feature we have - so what can we put in
>> JIRA
>> to show exactly what changes that have occurred.
>>
>> Justin
>>
>
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
Re: Git and revision numbers
Posted by Alex Harui <ah...@adobe.com>.
Let's stop for a second and identify what problems we are trying to solve.
I think there are actually several. I can think of:
1) Looking at JIRA ticket, what changes to Git were related
2) Looking at GIT log to see what JIRA issues got fixed (in order to update
release notes or when someone asks if a release contains a fix)
3) Determining if a release contains a particular commit/push
4) Monotonically increasing build numbers for version checking
It looks like folks solve #4 by counting commits to master. I guess that's
ok, but doesn't really seem that helpful. Can we solve #3 and #4 by
substituting YYYYMMDD as the build number? I think it solves #2 as well:
you can see if the log shows the JIRA issue before the date decoded from the
build number.
For #1, knowing the hash or partial hash still doesn't give you a sense for
when it happened. I suppose we could use dates here as well to at least
bracket what changes and assuming the log mentions the JIRA issue.
I saw suggestions that you name branches with the JIRA issue. I assume that
is because the branch name shows up automatically in the log when pushed?
Otherwise it is just a convention and folks will make mistakes.
Could we put a URL to the log message or even commit email in the JIRA
issue?
On 3/18/13 2:49 AM, "Frédéric THOMAS" <we...@hotmail.com> wrote:
> Hi Jose,
>
> I thought about the short sha1 too and it could work, I was thinking about a
> lightweight tag too (more readable), not sure though what is the best, I
> have to dig into more deeply.
>
> Thanks,
> -Fred
>
> -----Message d'origine-----
> From: Jose Barragan
> Sent: Monday, March 18, 2013 10:37 AM
> To: dev@flex.apache.org
> Subject: Re: Git and revision numbers
>
> In my work, I use the build number of the Hudson, or occasionally the short
> version of the commit SHA that I am building.
> Anyway, I leave as you get the short version of the SHA, in GIT
> git log -1 --pretty=format:%h
> --
> Jose Barragan
> Chief Software Architect
> Codeoscopic Madrid
> C/. Infanta Mercedes, 92.
> Planta 5. 505.
> 28020 Madrid.
> Tel.: +34 912 94 80 80
>
> On Mar 18, 2013, at 10:17 AM, Frédéric THOMAS <we...@hotmail.com>
> wrote:
>
>> JIRA use the JIRA Fisheye plugin to link the sources with, aparently, it's
>> not setup for our project, I retreived the infra ticket [1], we can then
>> directly deal with altassian to setup our project with fisheye.
>>
>> From [2] :
>>
>> Support FAQ
>> Can we use Fisheye to browse and search our repository?
>> Yes. See http://fisheye6.atlassian.com/ for some working examples. (Our
>> Jira Fisheye currently disabled, looking into it)
>>
>> The people at Atlassian kindly provide FishEye instances of ASF projects,
>> upon request.
>>
>> First, check with your project's PMC, and then ask Atlassian to setup a
>> FishEye instance for your project. (No need to keep infra the loop.)
>> Create a support request at Atlassian Support in the FishEye project.
>> Please use the "Public Hosting" component for your request.
>> If there is no response after a reasonable amount of time, infra has
>> access to set up projects on Fisheye, but consider this a last resort
>> option, Atlassian should be first point of contact.
>> Atlassian now run a local synced copy of the ASF repository, hence
>> requests can now be made direct without infra needing to be involved.
>>
>> So, I decided to open an issue at Altassian fisheye [3]
>>
>> -Fred
>>
>> [1] https://issues.apache.org/jira/browse/INFRA-5635
>> [2] https://cwiki.apache.org/INFRA/infra-faq.html
>> [3] https://support.atlassian.com/browse/JST-59433
>>
>> -----Message d'origine----- From: Frédéric THOMAS
>> Sent: Monday, March 18, 2013 9:29 AM
>> To: dev@flex.apache.org
>> Subject: Re: Git and revision numbers
>>
>> Who is JIRA admin btw ? it seem the fisheye plugin is there but
>> misconfigured.
>>
>> -Fred
>>
>> -----Message d'origine----- From: Frédéric THOMAS
>> Sent: Monday, March 18, 2013 9:19 AM
>> To: dev@flex.apache.org
>> Subject: Re: Git and revision numbers
>>
>>> That's a feature we have but maybe broken (we should deal with infra
>>> IMO).
>>
>> -Fred
>>
>> -----Message d'origine----- From: Justin Mclean
>> Sent: Monday, March 18, 2013 8:58 AM
>> To: dev@flex.apache.org
>> Subject: Re: Git and revision numbers
>>
>> Hi,
>>
>>> You can check writing the JIRA ticket id in the commit message(s), push
>>> it/them , then go to JIRA, in the source tab, you should see all the
>>> modified files (if this feature is not broken again).
>>
>> As far as I know this is not a feature we have - so what can we put in
>> JIRA
>> to show exactly what changes that have occurred.
>>
>> Justin
>>
>
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
Re: Git and revision numbers
Posted by Frédéric THOMAS <we...@hotmail.com>.
Hi Jose,
I thought about the short sha1 too and it could work, I was thinking about a
lightweight tag too (more readable), not sure though what is the best, I
have to dig into more deeply.
Thanks,
-Fred
-----Message d'origine-----
From: Jose Barragan
Sent: Monday, March 18, 2013 10:37 AM
To: dev@flex.apache.org
Subject: Re: Git and revision numbers
In my work, I use the build number of the Hudson, or occasionally the short
version of the commit SHA that I am building.
Anyway, I leave as you get the short version of the SHA, in GIT
git log -1 --pretty=format:%h
--
Jose Barragan
Chief Software Architect
Codeoscopic Madrid
C/. Infanta Mercedes, 92.
Planta 5. 505.
28020 Madrid.
Tel.: +34 912 94 80 80
On Mar 18, 2013, at 10:17 AM, Frédéric THOMAS <we...@hotmail.com>
wrote:
> JIRA use the JIRA Fisheye plugin to link the sources with, aparently, it's
> not setup for our project, I retreived the infra ticket [1], we can then
> directly deal with altassian to setup our project with fisheye.
>
> From [2] :
>
> Support FAQ
> Can we use Fisheye to browse and search our repository?
> Yes. See http://fisheye6.atlassian.com/ for some working examples. (Our
> Jira Fisheye currently disabled, looking into it)
>
> The people at Atlassian kindly provide FishEye instances of ASF projects,
> upon request.
>
> First, check with your project's PMC, and then ask Atlassian to setup a
> FishEye instance for your project. (No need to keep infra the loop.)
> Create a support request at Atlassian Support in the FishEye project.
> Please use the "Public Hosting" component for your request.
> If there is no response after a reasonable amount of time, infra has
> access to set up projects on Fisheye, but consider this a last resort
> option, Atlassian should be first point of contact.
> Atlassian now run a local synced copy of the ASF repository, hence
> requests can now be made direct without infra needing to be involved.
>
> So, I decided to open an issue at Altassian fisheye [3]
>
> -Fred
>
> [1] https://issues.apache.org/jira/browse/INFRA-5635
> [2] https://cwiki.apache.org/INFRA/infra-faq.html
> [3] https://support.atlassian.com/browse/JST-59433
>
> -----Message d'origine----- From: Frédéric THOMAS
> Sent: Monday, March 18, 2013 9:29 AM
> To: dev@flex.apache.org
> Subject: Re: Git and revision numbers
>
> Who is JIRA admin btw ? it seem the fisheye plugin is there but
> misconfigured.
>
> -Fred
>
> -----Message d'origine----- From: Frédéric THOMAS
> Sent: Monday, March 18, 2013 9:19 AM
> To: dev@flex.apache.org
> Subject: Re: Git and revision numbers
>
>> That's a feature we have but maybe broken (we should deal with infra
>> IMO).
>
> -Fred
>
> -----Message d'origine----- From: Justin Mclean
> Sent: Monday, March 18, 2013 8:58 AM
> To: dev@flex.apache.org
> Subject: Re: Git and revision numbers
>
> Hi,
>
>> You can check writing the JIRA ticket id in the commit message(s), push
>> it/them , then go to JIRA, in the source tab, you should see all the
>> modified files (if this feature is not broken again).
>
> As far as I know this is not a feature we have - so what can we put in
> JIRA
> to show exactly what changes that have occurred.
>
> Justin
>
Re: Git and revision numbers
Posted by Jose Barragan <jo...@codeoscopic.com>.
In my work, I use the build number of the Hudson, or occasionally the short version of the commit SHA that I am building.
Anyway, I leave as you get the short version of the SHA, in GIT
git log -1 --pretty=format:%h
--
Jose Barragan
Chief Software Architect
Codeoscopic Madrid
C/. Infanta Mercedes, 92.
Planta 5. 505.
28020 Madrid.
Tel.: +34 912 94 80 80
On Mar 18, 2013, at 10:17 AM, Frédéric THOMAS <we...@hotmail.com> wrote:
> JIRA use the JIRA Fisheye plugin to link the sources with, aparently, it's not setup for our project, I retreived the infra ticket [1], we can then directly deal with altassian to setup our project with fisheye.
>
> From [2] :
>
> Support FAQ
> Can we use Fisheye to browse and search our repository?
> Yes. See http://fisheye6.atlassian.com/ for some working examples. (Our Jira Fisheye currently disabled, looking into it)
>
> The people at Atlassian kindly provide FishEye instances of ASF projects, upon request.
>
> First, check with your project's PMC, and then ask Atlassian to setup a FishEye instance for your project. (No need to keep infra the loop.)
> Create a support request at Atlassian Support in the FishEye project. Please use the "Public Hosting" component for your request.
> If there is no response after a reasonable amount of time, infra has access to set up projects on Fisheye, but consider this a last resort option, Atlassian should be first point of contact.
> Atlassian now run a local synced copy of the ASF repository, hence requests can now be made direct without infra needing to be involved.
>
> So, I decided to open an issue at Altassian fisheye [3]
>
> -Fred
>
> [1] https://issues.apache.org/jira/browse/INFRA-5635
> [2] https://cwiki.apache.org/INFRA/infra-faq.html
> [3] https://support.atlassian.com/browse/JST-59433
>
> -----Message d'origine----- From: Frédéric THOMAS
> Sent: Monday, March 18, 2013 9:29 AM
> To: dev@flex.apache.org
> Subject: Re: Git and revision numbers
>
> Who is JIRA admin btw ? it seem the fisheye plugin is there but
> misconfigured.
>
> -Fred
>
> -----Message d'origine----- From: Frédéric THOMAS
> Sent: Monday, March 18, 2013 9:19 AM
> To: dev@flex.apache.org
> Subject: Re: Git and revision numbers
>
>> That's a feature we have but maybe broken (we should deal with infra IMO).
>
> -Fred
>
> -----Message d'origine----- From: Justin Mclean
> Sent: Monday, March 18, 2013 8:58 AM
> To: dev@flex.apache.org
> Subject: Re: Git and revision numbers
>
> Hi,
>
>> You can check writing the JIRA ticket id in the commit message(s), push it/them , then go to JIRA, in the source tab, you should see all the modified files (if this feature is not broken again).
>
> As far as I know this is not a feature we have - so what can we put in JIRA
> to show exactly what changes that have occurred.
>
> Justin
>
Re: Git and revision numbers
Posted by Frédéric THOMAS <we...@hotmail.com>.
JIRA use the JIRA Fisheye plugin to link the sources with, aparently, it's
not setup for our project, I retreived the infra ticket [1], we can then
directly deal with altassian to setup our project with fisheye.
>From [2] :
Support FAQ
Can we use Fisheye to browse and search our repository?
Yes. See http://fisheye6.atlassian.com/ for some working examples. (Our Jira
Fisheye currently disabled, looking into it)
The people at Atlassian kindly provide FishEye instances of ASF projects,
upon request.
First, check with your project's PMC, and then ask Atlassian to setup a
FishEye instance for your project. (No need to keep infra the loop.)
Create a support request at Atlassian Support in the FishEye project. Please
use the "Public Hosting" component for your request.
If there is no response after a reasonable amount of time, infra has access
to set up projects on Fisheye, but consider this a last resort option,
Atlassian should be first point of contact.
Atlassian now run a local synced copy of the ASF repository, hence requests
can now be made direct without infra needing to be involved.
So, I decided to open an issue at Altassian fisheye [3]
-Fred
[1] https://issues.apache.org/jira/browse/INFRA-5635
[2] https://cwiki.apache.org/INFRA/infra-faq.html
[3] https://support.atlassian.com/browse/JST-59433
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Monday, March 18, 2013 9:29 AM
To: dev@flex.apache.org
Subject: Re: Git and revision numbers
Who is JIRA admin btw ? it seem the fisheye plugin is there but
misconfigured.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Monday, March 18, 2013 9:19 AM
To: dev@flex.apache.org
Subject: Re: Git and revision numbers
> That's a feature we have but maybe broken (we should deal with infra IMO).
-Fred
-----Message d'origine-----
From: Justin Mclean
Sent: Monday, March 18, 2013 8:58 AM
To: dev@flex.apache.org
Subject: Re: Git and revision numbers
Hi,
> You can check writing the JIRA ticket id in the commit message(s), push
> it/them , then go to JIRA, in the source tab, you should see all the
> modified files (if this feature is not broken again).
As far as I know this is not a feature we have - so what can we put in JIRA
to show exactly what changes that have occurred.
Justin
Re: Git and revision numbers
Posted by Frédéric THOMAS <we...@hotmail.com>.
Who is JIRA admin btw ? it seem the fisheye plugin is there but
misconfigured.
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Monday, March 18, 2013 9:19 AM
To: dev@flex.apache.org
Subject: Re: Git and revision numbers
> That's a feature we have but maybe broken (we should deal with infra IMO).
-Fred
-----Message d'origine-----
From: Justin Mclean
Sent: Monday, March 18, 2013 8:58 AM
To: dev@flex.apache.org
Subject: Re: Git and revision numbers
Hi,
> You can check writing the JIRA ticket id in the commit message(s), push
> it/them , then go to JIRA, in the source tab, you should see all the
> modified files (if this feature is not broken again).
As far as I know this is not a feature we have - so what can we put in JIRA
to show exactly what changes that have occurred.
Justin
Re: Git and revision numbers
Posted by Frédéric THOMAS <we...@hotmail.com>.
> That's a feature we have but maybe broken (we should deal with infra IMO).
-Fred
-----Message d'origine-----
From: Justin Mclean
Sent: Monday, March 18, 2013 8:58 AM
To: dev@flex.apache.org
Subject: Re: Git and revision numbers
Hi,
> You can check writing the JIRA ticket id in the commit message(s), push
> it/them , then go to JIRA, in the source tab, you should see all the
> modified files (if this feature is not broken again).
As far as I know this is not a feature we have - so what can we put in JIRA
to show exactly what changes that have occurred.
Justin
Re: Git and revision numbers
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> You can check writing the JIRA ticket id in the commit message(s), push it/them , then go to JIRA, in the source tab, you should see all the modified files (if this feature is not broken again).
As far as I know this is not a feature we have - so what can we put in JIRA to show exactly what changes that have occurred.
Justin
Re: Git and revision numbers
Posted by Frédéric THOMAS <we...@hotmail.com>.
> And you loose all of your local commit history then. I'm not sure if that
> is ideal or not - guess it depends on how big the change is but that local
> history log may be useful.
Well, you'll still have the details in the logs, well, just found a good
reading about the different option [1] have a glance at it.
> Still no idea how we indicate what changes have occurred in JIRA.
> Previously we supplied a SVN revision number with would identify the
> changes easily and you'll know if your code had that change or not.
You can check writing the JIRA ticket id in the commit message(s), push
it/them , then go to JIRA, in the source tab, you should see all the
modified files (if this feature is not broken again).
-Fred
[1] http://365git.tumblr.com/post/4364212086/git-merge-squash
-----Message d'origine-----
From: Justin Mclean
Sent: Monday, March 18, 2013 4:06 AM
To: dev@flex.apache.org
Subject: Re: Git and revision numbers
Hi,
> which I squash a merge time using git merge --squash -m 'new ' newFeature.
And you loose all of your local commit history then. I'm not sure if that is
ideal or not - guess it depends on how big the change is but that local
history log may be useful.
Still no idea how we indicate what changes have occurred in JIRA. Previously
we supplied a SVN revision number with would identify the changes easily and
you'll know if your code had that change or not.
Thanks,
Justin
Re: Git and revision numbers
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> which I squash a merge time using git merge --squash -m 'new ' newFeature.
And you loose all of your local commit history then. I'm not sure if that is ideal or not - guess it depends on how big the change is but that local history log may be useful.
Still no idea how we indicate what changes have occurred in JIRA. Previously we supplied a SVN revision number with would identify the changes easily and you'll know if your code had that change or not.
Thanks,
Justin
Re: Git and revision numbers
Posted by Frédéric THOMAS <we...@hotmail.com>.
What I use to do is I commit generaly by JIRA Ticket, it happens I can do
more commits but amend them to still have one commit for a specific JIRA
Ticket at push time, if my ticket take time and a lot of commits, I create a
feature branch which I squash a merge time using git merge --squash -m 'new
' newFeature.
-Fred
-----Message d'origine-----
From: Justin Mclean
Sent: Monday, March 18, 2013 3:54 AM
To: dev@flex.apache.org
Subject: Re: Git and revision numbers
Hi,
>> Also how do we identify which GIT check in fixed a JIRA bug? Used to be
>> that we just add the SVN revision checkin but now a push can result in
>> several checkins.
>
> I would say indicating the JIRA Ticket id in the commit message
In every commit message? You may make a dozen or more local commits before
pushing - is there any way of adding a message when pushing? Can we enforce
this in any way?
What about the reverse how do we indicate what commits were made in the JIRA
ticket?
We can link to the diff web view but you have to do that for every local
commit you made.
eg
https://git-wip-us.apache.org/repos/asf?p=flex-sdk.git;a=commitdiff;h=fc57407c78d25a64afce4c12ac759139720f4347
Thanks,
Justin
Re: Git and revision numbers
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
>> Also how do we identify which GIT check in fixed a JIRA bug? Used to be that we just add the SVN revision checkin but now a push can result in several checkins.
>
> I would say indicating the JIRA Ticket id in the commit message
In every commit message? You may make a dozen or more local commits before pushing - is there any way of adding a message when pushing? Can we enforce this in any way?
What about the reverse how do we indicate what commits were made in the JIRA ticket?
We can link to the diff web view but you have to do that for every local commit you made.
eg https://git-wip-us.apache.org/repos/asf?p=flex-sdk.git;a=commitdiff;h=fc57407c78d25a64afce4c12ac759139720f4347
Thanks,
Justin
Re: Git and revision numbers
Posted by Frédéric THOMAS <we...@hotmail.com>.
> As far as I can see Git has no check in revision numbers. Currently the
> build release process uses SVN version number I think the number is
> appended to the RSLs and may be used elsewhere.
> Anyone have any ideas on how to resolve this?
Good question, really, at the moment I don't know, I'm going to dig into.
> Also how do we identify which GIT check in fixed a JIRA bug? Used to be
> that we just add the SVN revision checkin but now a push can result in
> several checkins.
I would say indicating the JIRA Ticket id in the commit message, it should
link commit(s) with this JIRA ticket but this feature didn't work with our
SVN, I don't know if we'll be luckier with GIT.
-Fred
-----Message d'origine-----
From: Justin Mclean
Sent: Monday, March 18, 2013 3:28 AM
To: dev@flex.apache.org
Subject: Git and revision numbers
Hi,
As far as I can see Git has no check in revision numbers. Currently the
build release process uses SVN version number I think the number is appended
to the RSLs and may be used elsewhere.
Anyone have any ideas on how to resolve this?
Also how do we identify which GIT check in fixed a JIRA bug? Used to be
that we just add the SVN revision checkin but now a push can result in
several checkins.
The commit hashes are rather ugly, for instance:
fc57407c78d25a64afce4c12ac759139720f4347 Added pt_PT postcode validator
strings
8645f87c26e55f55807e74befaa659b39c9ef93c Added pt_BR postcode validator
strings
2d41d857e14a9bce839285c8bb73da801b2c0877 Added ja_JP postcode validator
strings
8b9c4a6de050f821a6a3894dbda4f7091be2487c Added de_DE postcode validator
strings
Thanks,
Justin