On Mon, May 2, 2011 at 9:22 AM, Martin Dobias <span dir="ltr"><<a href="http://wonder.sk">wonder.sk</a>@<a href="http://gmail.com">gmail.com</a>></span> wrote:<div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
great stuff :-)<br>
<br>
The repository reads 59 branches and 82 tags. In my opinion we should:<br>
- remove all ancient tags not related to releases - like<br>
"root-before-SDTS-branch"<br>
- change all release branches to tags<br>
- remove all branches that have been merged or not touched for more<br>
than 1-2 years<br>
- for releases adopt a strategy e.g.: create release branch from<br>
master, do release-related commits there, when finished create a<br>
release tag and remove the release branch<br>
<br>
... we would end up with just few active branches and tags marking<br>
releases or other important milestones.</blockquote><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Then I have a question regarding merging stuff from other<br>
repositories. For example customization we have done with Radim is<br>
based on Sourcepole clone, Pirmin's globe work is also based on that<br>
clone. Those are repositories with a different base, so I would expect<br>
that merging will not work automatically. Anyone has some experience<br>
with such use case?<br>
<br>
Finally I have one major concern I have forgotten to discuss during<br>
the hackfest. There will be no commit revision numbers anymore, so<br>
developers will barely stay motivated to develop QGIS knowing that we<br>
will never reach (and celebrate) revision 16000 or 20000 (btw. now we<br>
are at r15861). Do you have any solution for that? Git's sha1 hashes<br>
for the commits may bring in some fun too, though they seem quite<br>
random :-)<br></blockquote><div><br></div><div>`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.</div>
<div><br></div><div>-Charlie</div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">Cheers<br>
<font color="#888888">Martin</font></blockquote><div> </div></div>