[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-scm-interest
Subject:    Re: [Kde-scm-interest] pushing rebased shared branches
From:       Michael Jansen <kde () michael-jansen ! biz>
Date:       2011-08-08 11:21:16
Message-ID: 3175932.cvHsts2UCe () gambit
[Download RAW message or body]

On Monday, August 08, 2011 12:39:02 PM Marcel Wiesweg wrote:
> Hi,
> 
> I have been fixing branches of SoK students, removing some dirty manual
> merges and branch mixups, by interactive rebase.
> I'm fully aware of the implications of rewriting history.
> 
> I had the recollection we could now force-push branches, but:
> 
> remote: + refs/heads/sok/presentation digikam mwiesweg DENIED by fallthru
> remote: error: hook declined to update refs/heads/sok/presentation
> To ssh://git@git.kde.org/digikam
>  ! [remote rejected] presentation -> sok/presentation (hook declined)
> 
> Missing something here?
> 
> I believe I can delete branches, so the alternative procedure would be to
> delete the branch and recreate it under the same name?

I do not like rewriting history of published branches in any way. If you have 
to do it why don't you do it the clean way?

Push the rewritten history into a new branch? Delete the old, keep the old? 
Noone will have to recover from anything, everyone will have the new version 
without trouble and given the way git works it should perform too.

Just be aware of the mail problem ben mentioned. Push in small doses if 
necessary.

I would propose to do it like that.

my-clean-history-branch-01
my-clean-history-branch-02
my-clean-history-branch-03
....

or 
my-rwritten-history-branch-2011-07-01
my-rwritten-history-branch-2011-07-20
my-rwritten-history-branch-2011-08-08

Mike
_______________________________________________
Kde-scm-interest mailing list
Kde-scm-interest@kde.org
https://mail.kde.org/mailman/listinfo/kde-scm-interest
[prev in list] [next in list] [prev in thread] [next in thread]