Many branches in the github master repo

classic Classic list List threaded Threaded
9 messages Options
Reply | Threaded
Open this post in threaded view
|

Many branches in the github master repo

Dimitry Polivaev
Administrator
Hello,

currently our github repo contains many obsolete feature branches. I suggest to remove feature
branches already merged into the product branches or not under development namely

   origin/SimpleFX
   origin/clones
   origin/docear/public
   origin/docear/trunk
   origin/esiminch_multiparent
   origin/headless
   origin/jgoodies1.6
   origin/latex_in_core
   origin/master_ribbons
   origin/openmaps2
   origin/openmaps_integration
   origin/reorganize_menus
   origin/reorganize_preferences
   origin/scripting

and to keep at most only one of

   origin/Dimitry_FreeplaneFX
   origin/javafx

(@Kent : which one?)

Any objections ?

The complete list of all branches is

   origin/1.2.x
   origin/1.3.x
   origin/1.4.x
   origin/1_3_x_collaboration
   origin/Dimitry_FreeplaneFX
   origin/FreeplaneFX
   origin/Gradle_builds
   origin/SimpleFX
   origin/clones
   origin/docear/public
   origin/docear/trunk
   origin/esiminch_multiparent
   origin/headless
   origin/jgoodies1.6
   origin/latex_in_core
   origin/master
   origin/master_ribbons
   origin/menustructure
   origin/openmaps2
   origin/openmaps_integration
   origin/readonly_maps
   origin/reorganize_menus
   origin/reorganize_preferences
   origin/scripting

Regards,
Dimitry
Reply | Threaded
Open this post in threaded view
|

Re: Many branches in the github master repo

Felix Natter
Administrator
"Dimitry Polivaev [via Freeplane Developer]"
<[hidden email]> writes:

> Hello,

hi Dimitry,

> currently our github repo contains many obsolete feature branches. I
> suggest to remove feature
> branches already merged into the product branches or not under development
> namely

I think it would be good to keep them. For instance, if a bug is
reported related to the new readonly map handling, then I would
look up my commits in the readonly_maps branch.

Or is there another solution for this use case?

Cheers and Best Regards,
--
Felix Natter
Reply | Threaded
Open this post in threaded view
|

Re: Many branches in the github master repo

Dimitry Polivaev
Administrator
> I think it would be good to keep them. For instance, if a bug is
> reported related to the new readonly map handling, then I would
> look up my commits in the readonly_maps branch.
>
> Or is there another solution for this use case?

I think that removing a branch das not remove any commit already merged in any other existing branch.

Reply | Threaded
Open this post in threaded view
|

Re: Many branches in the github master repo

theworldbright
In reply to this post by Dimitry Polivaev
Hello Dimitry!

origin/Dimitry_FreeplaneFX
origin/javafx

I believe both have been deleted? The only branch I currently have that is related to JavaFX is Freeplane/FreeplaneFX.

Regards,

Kent Shikama
Reply | Threaded
Open this post in threaded view
|

Re: Many branches in the github master repo

Felix Natter
Administrator
In reply to this post by Dimitry Polivaev
"Dimitry Polivaev [via Freeplane Developer]"
<[hidden email]> writes:

>> I think it would be good to keep them. For instance, if a bug is
>> reported related to the new readonly map handling, then I would
>> look up my commits in the readonly_maps branch.
>>
>> Or is there another solution for this use case?
>
> I think that removing a branch das not remove any commit already merged in
> any other existing branch.

How do we find out?

Best Regards,
--
Felix Natter
Reply | Threaded
Open this post in threaded view
|

Re: Many branches in the github master repo

Dimitry Polivaev
Administrator
> How do we find out?

Tommorow by skype.

Reply | Threaded
Open this post in threaded view
|

Re: Many branches in the github master repo

h.goebel
Administrator
In reply to this post by Felix Natter
Am 25.04.2015 um 20:59 schrieb Felix Natter [via Freeplane Developer]:
> > I think that removing a branch das not remove any commit already
> merged in
> > any other existing branch.

This is true, simply because the commit is contained in the
commit-chain. You will only loos commits, if the branch-head is not
merged. AFAIK in this case you will even get a warning.

Another alternative would be to delete the branches in the central
git-repo, but keep it in your personal one.

--
Regards
Hartmut Goebel

| Hartmut Goebel          | [hidden email]               |
| www.crazy-compilers.com | compilers which you thought are impossible |

--
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |
Reply | Threaded
Open this post in threaded view
|

Re: Many branches in the github master repo

Felix Natter
Administrator
"h.goebel [via Freeplane Developer]"
<[hidden email]> writes:

> Am 25.04.2015 um 20:59 schrieb Felix Natter [via Freeplane Developer]:
>> > I think that removing a branch das not remove any commit already
>> merged in
>> > any other existing branch.
>
> This is true, simply because the commit is contained in the
> commit-chain. You will only loos commits, if the branch-head is not
> merged. AFAIK in this case you will even get a warning.

I am sure the commits won't be lost, but I am concerned about
the mapping between the task branch name and the commit names.
This is not a problem for "readonly_maps" since I've prefixed all of them
with "2202:" [1]. This is not the case for the "openmaps2" branch [2].

[1] https://github.com/freeplane/freeplane/commits/readonly_maps
[2] https://github.com/freeplane/freeplane/commits/openmaps2

> Another alternative would be to delete the branches in the central
> git-repo, but keep it in your personal one.

If you really want to delete the branches, then this would be an option,
yes.

Cheers and Best Regards,
--
Felix Natter
Reply | Threaded
Open this post in threaded view
|

Re: Many branches in the github master repo

Felix Natter
Administrator
In reply to this post by Dimitry Polivaev
"Dimitry Polivaev [via Freeplane Developer]"
<[hidden email]> writes:

> Hello,

hi Dimitry,

> currently our github repo contains many obsolete feature branches. I
> suggest to remove feature
> branches already merged into the product branches or not under development
> namely

as discussed on skype, I would like to keep origin/openmaps2 and
origin/readonly_maps for reference when fixing bugs (and of course, I
agree with you that we should keep release branches).

Thanks and Best Regards,
--
Felix Natter