kicad-developers team mailing list archive

[Wayne Stambaugh <stambaughw@xxxxxxxxx>]

@Nick, have you had a chance to look at this patch?  Since you wrote
this I thought you should have some input.  I'm not sure if this the
correct behavior when using git to generate the KiCad version string.
It seems as though Joseph is correct.  Would you please take a look at
it when you get a chance and let me know if it should be committed.

Thanks,

Wayne

On 8/30/2015 4:24 PM, Joseph Chen wrote:
> Please review and apply the attached patch file of CreateGitVersion.cmake.
> 
> *Issue to be fixed: a False BZR version number**
> *
> The details:
> After cloning the repo of git-source-mirror, and working in my own local
> branch, and committing a X times, the BZR version-number that is
> generated by file CreateGitVersion.cmake is incremented by X number. 
> This is a mismatch of the true BZR number.
> 
> The tests:
> _Before applying this patch_:
> 
> The command "Copy Version Info" built from the origin "master" branch
> displays the following:
>         Version: (2015-08-30 *BZR 6134, Git 4e94d52*)-product release build
> which is correct.
> 
> _However_, after creating a local branch based off the "master" branch,
> and having committed 2 more times in the local branch, the command "Copy
> Version Info" built from the local branch displays the following false
> BZR number:
>         Version: (2015-08-30 *BZR 6136, Git edfb32e*)-product release build
> which is _false_, because at the time the official BZR number is only
> *6134*.
> 
> 
> _After applying this_patch_:
> The command "Copy Version Info" built from the "master" branch displays
> the following:
>          Version: (2015-08-30 *BZR 6134, Git 4e94d52*)-product release build
> which is still correct.
> 
> Now, the command "Copy Version Info" built from the local branch that
> has 2 extra commits displayes the following:
>         Version: (2015-08-30 *BZR 6134, Git 4e94d52-ede23f9*)-product
> release build
> which is still correct with a _true_ *BZR 6134*, plus it has an *added
> GIT short hash* from the local branch HEAD.
> 
> This added GIT short hash tells us that the running version is built
> based off a true BZR 6134, plus some local modifications up to GIT short
> hash of *ede23f9.*
> 
> --Joe
> 
> 
> _______________________________________________
> Mailing list: https://launchpad.net/~kicad-developers
> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~kicad-developers
> More help   : https://help.launchpad.net/ListHelp
>