[Dune-devel] Private write access for Andreas

Markus Blatt markus at dr-blatt.de
Tue May 7 15:42:25 CEST 2013


On Tue, May 07, 2013 at 02:34:30PM +0200, Steffen Müthing wrote:
> Hi,
> 
> I just gave Andreas contributor access to the core modules (i.e. access
> to the p/andreasbuhr/* branch namespace).
> 
> While Andreas already addressed some of your concerns in his mail,
> I have some additional remarks:
> 
> Am 07.05.2013 um 13:04 schrieb Markus Blatt:
> 
> > I am really wondering whether this approach is such a good idea. You
> > are saying that it eases merging. What you save is adding another
> > upstream repository (the one where Andreas has write access) to your
> > local repository. Having it added one can merge easily between the remote
> > repositories. Actually, I am unsure if one even needs this. Can't
> > Andreas sends you or flyspray a git-diff or something like that.
> 
> Well, wrangling those patch files is really inconvenient compared to just requesting
> a merge, especially if it happens frequently… ;-)
> But that is exactly why I wrote the other, rather long mail to the list: We have to
> think about how we want to handle patches in the future, and I think the best
> way to figure that out is by just trying viable approaches...

Sorry, but this is simply not true. I work on projects that use
github. If you do not blindly trust your contributor, you have to do
the same thing. Or if you want to test whether the fix of another
contributor fixes your problem you have to the same, too:

1. Add their repository as another upstream repository.
2. fetch their branch and origin (here you just save to fetch the 3rd
party branch)
3. create a new branch from the master and merge the fix.
4. compile and test (BTW: This essential part is not automated by
git).


> But while personal branches don't mess up the commit mailing list, they do pollute the
> branch namespace, so it is important to delete them once they are not needed anymore
> (e.g. because they have been merged). Otherwise, the list of branches in the repository
> browser could get very long…
> 

Shame on me. I should do that for a couple of branches.

> > 
> > ™[Snipping the rest]
> >

Cheers,

Markus


-- 
Do you need more support with DUNE or HPC in general? 

Dr. Markus Blatt - HPC-Simulation-Software & Services http://www.dr-blatt.de
Hans-Bunte-Str. 8-10, 69123 Heidelberg, Germany
Tel.: +49 (0) 160 97590858  Fax: +49 (0)322 1108991658 




More information about the Dune-devel mailing list