[Qgis-developer] Git repo available for testing

Charlie Sharpsteen chuck at sharpsteen.net
Mon May 2 16:15:41 EDT 2011


On Mon, May 2, 2011 at 9:22 AM, Martin Dobias <wonder.sk at gmail.com> wrote:

> great stuff :-)
>
> The repository reads 59 branches and 82 tags. In my opinion we should:
> - remove all ancient tags not related to releases - like
> "root-before-SDTS-branch"
> - change all release branches to tags
> - remove all branches that have been merged or not touched for more
> than 1-2 years
> - for releases adopt a strategy e.g.: create release branch from
> master, do release-related commits there, when finished create a
> release tag and remove the release branch
>
> ... we would end up with just few active branches and tags marking
> releases or other important milestones.

Then I have a question regarding merging stuff from other
> repositories. For example customization we have done with Radim is
> based on Sourcepole clone, Pirmin's globe work is also based on that
> clone. Those are repositories with a different base, so I would expect
> that merging will not work automatically. Anyone has some experience
> with such use case?
>
> Finally I have one major concern I have forgotten to discuss during
> the hackfest. There will be no commit revision numbers anymore, so
> developers will barely stay motivated to develop QGIS knowing that we
> will never reach (and celebrate) revision 16000 or 20000 (btw. now we
> are at r15861). Do you have any solution for that? Git's sha1 hashes
> for the commits may bring in some fun too, though they seem quite
> random :-)
>

`git describe` will return the number of commits since the last tag or some
other reference point of your choosing if you need a linear "commit number"
to track.  Another thing that can help developer motivation is `git shortlog
-s -n` which computes the number of commits per author and displays a sorted
list.

-Charlie



> Cheers
> Martin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.osgeo.org/pipermail/qgis-developer/attachments/20110502/43feec62/attachment.html


More information about the Qgis-developer mailing list