Hi there,
you might have already noticed something was going on in our Git repos if you're
subscribed to dpp-robot [1] and received over 130 e-mails today.
(Sorry, for that! I did not know that our Sourceforge post-receive script, which
generates all dpp-robot e-mails, does not handle batch operations well.)
I performed the following changes on our repo and all its mirrors:
- Deleted all release/* and development/* branches (except for the most recent
three, see [2])
- Introduced tags for the "endpoints" of the release branches, so it still
easy to see which commits belonged to the release branch or the the master
during the release process (just in case anyone wants to know ...):
...
* 92dfa116b [FEATURE] Take first steps towards Saros Server
* 2c0b65368 [BUILD] Merged 'release/13.12.6' back into 'master'
|\
| * e13c31f75 (tag: v13.12.6) [BUILD] Changes necessary for Release 13.12.6
| * 1ef7fb368 [BUILD] Put last state of the update-site under version control
| * 4ef73f77c [BUILD] Prepared Beta-Update site for 13.12.6
| * e50262080 [FIX] invitation page displays null when no nickname is
available
| * 03c2f03b3 [BUILD] Opened release branch 13.12.6
* | 3b82df7ec [GUI] removed sound group from the communication pref. page
* | 637818630 [INTERNAL] ensure a contact can not invited multiple times at
once
* | cd19883d6 [FEATURE][PART2] #109 Create new preference page
"Personalization"
* | 75a24adc4 [BUILD] updated ant build file
...
(GitHub also lists "43 releases" (= tags) now, instead of "1 release".)
- In addition, I deleted all old tags, which were mostly residues from our
pre-2012 SVN repo.
Depending on your Git fetch configuration, you may still have
"origin/development/*"
(or "release") branches in your local repository.
You may use the "prune" flag to cut off all deleted remote branches.
Examples:
* "git fetch origin --prune" --> Uses your current "fetch" configuration and
deletes old branches that are covered by
that configuration.
As my "fetch" configuration only includes
the master branch, stale remote branches
were *not* deleted by this command.
* "git fetch origin --prune refs/heads/*:refs/remotes/origin/*"
--> Fetches all remote branches and deletes *any*
stale remote branches.
If you never fetched anything else but the
master branch, you will end up with *more*
remote branches (the three most recent dev
branches mentioned above).
If, for any reason, someone should be interested in the old development branches
and tags, there is an "saros-archive" repo on Github [3] which includes all of
this
original data (its master branch is just long enough to cover all branching
points,
so comparisons can be made easily, but it will not be updated).
The branch overview [4] gives some visual insight into who many commits each of
those 35+ development branches did not merge into the master.
Cheers,
Franz
[1] https://lists.sourceforge.net/lists/listinfo/dpp-robot
[2] http://saros-build.imp.fu-berlin.de/gerrit/#/admin/projects/saros,branches
[3] https://github.com/saros-project/saros-archive
[4] https://github.com/saros-project/saros-archive/branches/all
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
DPP-Devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dpp-devel
