Re: [macports-ports] branch dar created (now 3c4f428)

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

Re: [macports-ports] branch dar created (now 3c4f428)

ryandesign2
Administrator
Hi Mark,


On Mar 27, 2020, at 16:19, Mark Evenson wrote:

> Mark Evenson (easye) pushed a change to branch dar
> in repository macports-ports.
>
>      at 3c4f428  dar: don't opportunistically try to build Python bindings
>
> This branch includes the following new commits:
>
>     new 3c4f428  dar: don't opportunistically try to build Python bindings
>
> The 1 revisions listed above as "new" are entirely new to this
> repository and will be described in separate emails.  The revisions
> listed as "add" were already present in the repository and have only
> been added to this reference.

You keep recreating this branch. What's going on? :)

This branch was merged to master in April and deleted:

https://github.com/macports/macports-ports/pull/6722

We don't need the branch anymore. It should stay deleted.

Did you maybe sync all public branches to your clone at some point while this branch existed? And now when you are wanting to publish other changes you are pushing all your branches back to master? I'm not sure what the git commands to do those things would be, but I can't imagine what else could be happening. I'm sure you're not doing it deliberately but it would be good if we could figure it out so that we can stop it.


Reply | Threaded
Open this post in threaded view
|

Re: [macports-ports] branch dar created (now 3c4f428)

Joshua Root-8
On 2020-6-2 02:32 , Ryan Schmidt wrote:

> Hi Mark,
>
>
> On Mar 27, 2020, at 16:19, Mark Evenson wrote:
>
>> Mark Evenson (easye) pushed a change to branch dar
>> in repository macports-ports.
>>
>>      at 3c4f428  dar: don't opportunistically try to build Python bindings
>>
>> This branch includes the following new commits:
>>
>>     new 3c4f428  dar: don't opportunistically try to build Python bindings
>>
>> The 1 revisions listed above as "new" are entirely new to this
>> repository and will be described in separate emails.  The revisions
>> listed as "add" were already present in the repository and have only
>> been added to this reference.
>
> You keep recreating this branch. What's going on? :)
>
> This branch was merged to master in April and deleted:
>
> https://github.com/macports/macports-ports/pull/6722
>
> We don't need the branch anymore. It should stay deleted.
>
> Did you maybe sync all public branches to your clone at some point while this branch existed? And now when you are wanting to publish other changes you are pushing all your branches back to master? I'm not sure what the git commands to do those things would be, but I can't imagine what else could be happening. I'm sure you're not doing it deliberately but it would be good if we could figure it out so that we can stop it.

Given the issues this can cause, i.e. duplicate messages like
<https://trac.macports.org/ticket/59859#comment:4> and many others,
maybe we should restrict creation of new branches in macports-ports. We
already recommend using a personal fork for development and creation of PRs.

- Josh
Reply | Threaded
Open this post in threaded view
|

Re: [macports-ports] branch dar created (now 3c4f428)

Mark Evenson
In reply to this post by ryandesign2


> On Jun 1, 2020, at 18:32, Ryan Schmidt <[hidden email]> wrote:
>
> Hi Mark,
>
>
> On Mar 27, 2020, at 16:19, Mark Evenson wrote:
>
>> Mark Evenson (easye) pushed a change to branch dar
>> in repository macports-ports.
>>
>>     at 3c4f428  dar: don't opportunistically try to build Python bindings
>>
>> This branch includes the following new commits:
>>
>>    new 3c4f428  dar: don't opportunistically try to build Python bindings
>>
>> The 1 revisions listed above as "new" are entirely new to this
>> repository and will be described in separate emails.  The revisions
>> listed as "add" were already present in the repository and have only
>> been added to this reference.
>
> You keep recreating this branch. What's going on? :)


Nothing too intelligent on my side, my apologies.

>
> This branch was merged to master in April and deleted:
>
> https://github.com/macports/macports-ports/pull/6722
>
> We don't need the branch anymore. It should stay deleted.
>
> Did you maybe sync all public branches to your clone at some point while this branch existed? And now when you are wanting to publish other changes you are pushing all your branches back to master? I'm not sure what the git commands to do those things would be, but I can't imagine what else could be happening. I'm sure you're not doing it deliberately but it would be good if we could figure it out so that we can stop it.

I have cleared out the faulty local index which had retained the open branches,
so this shouldn’t happen again.

But I think Joshua’s suggestion to change my workflow to fork the
macports-ports repo, submitting and accepting my own merge requests will be the
best way forward for everyone to avoid such headaches in the future.

--
"A screaming comes across the sky.  It has happened before but there is nothing
to compare to it now."





Reply | Threaded
Open this post in threaded view
|

Re: [macports-ports] branch dar created (now 3c4f428)

ryandesign2
Administrator
In reply to this post by Joshua Root-8
On Jun 1, 2020, at 22:21, wrote:

> On 2020-6-2 02:32 , Ryan Schmidt wrote:
>> Hi Mark,
>>
>>
>> On Mar 27, 2020, at 16:19, Mark Evenson wrote:
>>
>>> Mark Evenson (easye) pushed a change to branch dar
>>> in repository macports-ports.
>>>
>>>     at 3c4f428  dar: don't opportunistically try to build Python bindings
>>>
>>> This branch includes the following new commits:
>>>
>>>    new 3c4f428  dar: don't opportunistically try to build Python bindings
>>>
>>> The 1 revisions listed above as "new" are entirely new to this
>>> repository and will be described in separate emails.  The revisions
>>> listed as "add" were already present in the repository and have only
>>> been added to this reference.
>>
>> You keep recreating this branch. What's going on? :)
>>
>> This branch was merged to master in April and deleted:
>>
>> https://github.com/macports/macports-ports/pull/6722
>>
>> We don't need the branch anymore. It should stay deleted.
>>
>> Did you maybe sync all public branches to your clone at some point while this branch existed? And now when you are wanting to publish other changes you are pushing all your branches back to master? I'm not sure what the git commands to do those things would be, but I can't imagine what else could be happening. I'm sure you're not doing it deliberately but it would be good if we could figure it out so that we can stop it.
>
> Given the issues this can cause, i.e. duplicate messages like
> <https://trac.macports.org/ticket/59859#comment:4> and many others,
> maybe we should restrict creation of new branches in macports-ports. We
> already recommend using a personal fork for development and creation of PRs.


Ok, sounds reasonable.

Reply | Threaded
Open this post in threaded view
|

Re: [macports-ports] branch dar created (now 3c4f428)

Joshua Root-8
On 2020-6-3 03:58 , Ryan Schmidt wrote:

> On Jun 1, 2020, at 22:21, wrote:
>
>> On 2020-6-2 02:32 , Ryan Schmidt wrote:
>>> Hi Mark,
>>>
>>>
>>> On Mar 27, 2020, at 16:19, Mark Evenson wrote:
>>>
>>>> Mark Evenson (easye) pushed a change to branch dar
>>>> in repository macports-ports.
>>>>
>>>>     at 3c4f428  dar: don't opportunistically try to build Python bindings
>>>>
>>>> This branch includes the following new commits:
>>>>
>>>>    new 3c4f428  dar: don't opportunistically try to build Python bindings
>>>>
>>>> The 1 revisions listed above as "new" are entirely new to this
>>>> repository and will be described in separate emails.  The revisions
>>>> listed as "add" were already present in the repository and have only
>>>> been added to this reference.
>>>
>>> You keep recreating this branch. What's going on? :)
>>>
>>> This branch was merged to master in April and deleted:
>>>
>>> https://github.com/macports/macports-ports/pull/6722
>>>
>>> We don't need the branch anymore. It should stay deleted.
>>>
>>> Did you maybe sync all public branches to your clone at some point while this branch existed? And now when you are wanting to publish other changes you are pushing all your branches back to master? I'm not sure what the git commands to do those things would be, but I can't imagine what else could be happening. I'm sure you're not doing it deliberately but it would be good if we could figure it out so that we can stop it.
>>
>> Given the issues this can cause, i.e. duplicate messages like
>> <https://trac.macports.org/ticket/59859#comment:4> and many others,
>> maybe we should restrict creation of new branches in macports-ports. We
>> already recommend using a personal fork for development and creation of PRs.
>
>
> Ok, sounds reasonable.

Well, I tried, but GitHub apparently doesn't have this ability. You can
only restrict pushing to existing branches, not creation of new ones
(even if the new branch has a name that should match a rule).

- Josh