You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@sentry.apache.org by Alexander Kolbasov <ak...@cloudera.com> on 2017/07/27 18:50:23 UTC
Access to the sentry git repository
Hello,
as we discussed earlier we need to delete current master which is now 1.8.0
and create a new master from sentry-ha-redesign.
Since git doesn't support remote renames, the only way to do this is to
delete master branch, but this requires changing
'receive.denyDeleteCurrent' pproperty *on the server*.
Is there a way to set this property either via some web interface or by
logging to an appropriate host?
- Alex
Re: Access to the sentry git repository
Posted by Alexander Kolbasov <ak...@cloudera.com>.
The merge commit preserves all the history from both existing master and
sentry-ha-redesign branch.
On Fri, Jul 28, 2017 at 6:27 PM, Sergio Pena <se...@cloudera.com>
wrote:
> Does the merge commit still leaves the history of sentry-ha-redesign? Or it
> wraps all those commits into one single merge commit?
>
> If we do leave the history, then it would be fine to do it.
>
> On Fri, Jul 28, 2017 at 11:23 AM, Alexander Kolbasov <ak...@cloudera.com>
> wrote:
>
> > This seems to be the only available option if we can't delete master. But
> > this will create merge commit. So far we were avoiding merge commits, but
> > it may be ok in this case. What do you guys think - is it ok to introduce
> > merge commit to move sentry-ha-redesign to master?
> >
> > On Fri, Jul 28, 2017 at 10:56 AM, Colm O hEigeartaigh <
> coheigea@apache.org
> > >
> > wrote:
> >
> > > Instead of deleting the branch, we could look at doing something like
> the
> > > answer suggested here:
> > >
> > > https://stackoverflow.com/questions/2862590/how-to-
> > > replace-master-branch-in-git-entirely-from-another-branch
> > >
> > > git checkout sentry-ha-redesign
> > > git merge -s ours master
> > > git checkout master
> > > git merge sentry-ha-redesign
> > >
> > > Colm.
> > >
> > >
> > > On Thu, Jul 27, 2017 at 7:50 PM, Alexander Kolbasov <
> akolb@cloudera.com>
> > > wrote:
> > >
> > > > Hello,
> > > >
> > > > as we discussed earlier we need to delete current master which is now
> > > 1.8.0
> > > > and create a new master from sentry-ha-redesign.
> > > >
> > > > Since git doesn't support remote renames, the only way to do this is
> to
> > > > delete master branch, but this requires changing
> > > > 'receive.denyDeleteCurrent' pproperty *on the server*.
> > > >
> > > > Is there a way to set this property either via some web interface or
> by
> > > > logging to an appropriate host?
> > > >
> > > > - Alex
> > > >
> > >
> > >
> > >
> > > --
> > > Colm O hEigeartaigh
> > >
> > > Talend Community Coder
> > > http://coders.talend.com
> > >
> >
>
Re: Access to the sentry git repository
Posted by Sergio Pena <se...@cloudera.com>.
Does the merge commit still leaves the history of sentry-ha-redesign? Or it
wraps all those commits into one single merge commit?
If we do leave the history, then it would be fine to do it.
On Fri, Jul 28, 2017 at 11:23 AM, Alexander Kolbasov <ak...@cloudera.com>
wrote:
> This seems to be the only available option if we can't delete master. But
> this will create merge commit. So far we were avoiding merge commits, but
> it may be ok in this case. What do you guys think - is it ok to introduce
> merge commit to move sentry-ha-redesign to master?
>
> On Fri, Jul 28, 2017 at 10:56 AM, Colm O hEigeartaigh <coheigea@apache.org
> >
> wrote:
>
> > Instead of deleting the branch, we could look at doing something like the
> > answer suggested here:
> >
> > https://stackoverflow.com/questions/2862590/how-to-
> > replace-master-branch-in-git-entirely-from-another-branch
> >
> > git checkout sentry-ha-redesign
> > git merge -s ours master
> > git checkout master
> > git merge sentry-ha-redesign
> >
> > Colm.
> >
> >
> > On Thu, Jul 27, 2017 at 7:50 PM, Alexander Kolbasov <ak...@cloudera.com>
> > wrote:
> >
> > > Hello,
> > >
> > > as we discussed earlier we need to delete current master which is now
> > 1.8.0
> > > and create a new master from sentry-ha-redesign.
> > >
> > > Since git doesn't support remote renames, the only way to do this is to
> > > delete master branch, but this requires changing
> > > 'receive.denyDeleteCurrent' pproperty *on the server*.
> > >
> > > Is there a way to set this property either via some web interface or by
> > > logging to an appropriate host?
> > >
> > > - Alex
> > >
> >
> >
> >
> > --
> > Colm O hEigeartaigh
> >
> > Talend Community Coder
> > http://coders.talend.com
> >
>
Re: Access to the sentry git repository
Posted by Alexander Kolbasov <ak...@cloudera.com>.
This seems to be the only available option if we can't delete master. But
this will create merge commit. So far we were avoiding merge commits, but
it may be ok in this case. What do you guys think - is it ok to introduce
merge commit to move sentry-ha-redesign to master?
On Fri, Jul 28, 2017 at 10:56 AM, Colm O hEigeartaigh <co...@apache.org>
wrote:
> Instead of deleting the branch, we could look at doing something like the
> answer suggested here:
>
> https://stackoverflow.com/questions/2862590/how-to-
> replace-master-branch-in-git-entirely-from-another-branch
>
> git checkout sentry-ha-redesign
> git merge -s ours master
> git checkout master
> git merge sentry-ha-redesign
>
> Colm.
>
>
> On Thu, Jul 27, 2017 at 7:50 PM, Alexander Kolbasov <ak...@cloudera.com>
> wrote:
>
> > Hello,
> >
> > as we discussed earlier we need to delete current master which is now
> 1.8.0
> > and create a new master from sentry-ha-redesign.
> >
> > Since git doesn't support remote renames, the only way to do this is to
> > delete master branch, but this requires changing
> > 'receive.denyDeleteCurrent' pproperty *on the server*.
> >
> > Is there a way to set this property either via some web interface or by
> > logging to an appropriate host?
> >
> > - Alex
> >
>
>
>
> --
> Colm O hEigeartaigh
>
> Talend Community Coder
> http://coders.talend.com
>
Re: Access to the sentry git repository
Posted by Colm O hEigeartaigh <co...@apache.org>.
Instead of deleting the branch, we could look at doing something like the
answer suggested here:
https://stackoverflow.com/questions/2862590/how-to-replace-master-branch-in-git-entirely-from-another-branch
git checkout sentry-ha-redesign
git merge -s ours master
git checkout master
git merge sentry-ha-redesign
Colm.
On Thu, Jul 27, 2017 at 7:50 PM, Alexander Kolbasov <ak...@cloudera.com>
wrote:
> Hello,
>
> as we discussed earlier we need to delete current master which is now 1.8.0
> and create a new master from sentry-ha-redesign.
>
> Since git doesn't support remote renames, the only way to do this is to
> delete master branch, but this requires changing
> 'receive.denyDeleteCurrent' pproperty *on the server*.
>
> Is there a way to set this property either via some web interface or by
> logging to an appropriate host?
>
> - Alex
>
--
Colm O hEigeartaigh
Talend Community Coder
http://coders.talend.com