Re: [ofbiz-framework] branch pr/13 created (now ae98498)

Not sure how and why this happened and what it's for...

Do we need to document that?

Le 12/02/2020 à 12:11, [hidden email] a écrit :

> This is an automated email from the ASF dual-hosted git repository.
>
> jleroux pushed a change to branch pr/13
> in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.
>
>
>        at ae98498  Implemented: Add 'controlPath' attribute
>
> No new revisions were added by this update.
>

[Pierre Smits-3]

I don't know how this happened, but the result in my local git clone
(through my client SourceTree) is the following when I do a fetch:

git --no-optional-locks -c color.branch=false -c color.diff=false -c
color.status=false -c diff.mnemonicprefix=false -c core.quotepath=false -c
credential.helper=sourcetree fetch --prune OFBiz

fatal: Cannot fetch both refs/pull/13/head and refs/heads/pr/13 to
refs/remotes/OFBiz/pr/13

Completed with errors, see above



Best regards,

Pierre Smits
*Proud* *contributor* (but without privileges)* of* Apache OFBiz
<https://ofbiz.apache.org/>, since 2008

*Apache Trafodion <https://trafodion.apache.org>, Vice President*
*Apache Directory <https://directory.apache.org>, PMC Member*
Apache Incubator <https://incubator.apache.org>, committer
Apache Steve <https://steve.apache.org>, committer


On Wed, Feb 12, 2020 at 12:18 PM [hidden email] <[hidden email]>
wrote:

> Not sure how and why this happened and what it's for...
>
> Do we need to document that?
>
> Le 12/02/2020 à 12:11, [hidden email] a écrit :
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > jleroux pushed a change to branch pr/13
> > in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.
> >
> >
> >        at ae98498  Implemented: Add 'controlPath' attribute
> >
> > No new revisions were added by this update.
> >
>

[Jacques Le Roux]

I just made a commit and a push after cherry-picking your commit from PR13

Seems OK on OFBiz side

https://gitbox.apache.org/repos/asf?p=ofbiz-framework.git;a=summary

Le 12/02/2020 à 12:34, Pierre Smits a écrit :

> I don't know how this happened, but the result in my local git clone
> (through my client SourceTree) is the following when I do a fetch:
>
> git --no-optional-locks -c color.branch=false -c color.diff=false -c
> color.status=false -c diff.mnemonicprefix=false -c core.quotepath=false -c
> credential.helper=sourcetree fetch --prune OFBiz
>
> fatal: Cannot fetch both refs/pull/13/head and refs/heads/pr/13 to
> refs/remotes/OFBiz/pr/13
>
> Completed with errors, see above
>
>
>
> Best regards,
>
> Pierre Smits
> *Proud* *contributor* (but without privileges)* of* Apache OFBiz
> <https://ofbiz.apache.org/>, since 2008
>
> *Apache Trafodion <https://trafodion.apache.org>, Vice President*
> *Apache Directory <https://directory.apache.org>, PMC Member*
> Apache Incubator <https://incubator.apache.org>, committer
> Apache Steve <https://steve.apache.org>, committer
>
>
> On Wed, Feb 12, 2020 at 12:18 PM [hidden email] <[hidden email]>
> wrote:
>
>> Not sure how and why this happened and what it's for...
>>
>> Do we need to document that?
>>
>> Le 12/02/2020 à 12:11, [hidden email] a écrit :
>>> This is an automated email from the ASF dual-hosted git repository.
>>>
>>> jleroux pushed a change to branch pr/13
>>> in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.
>>>
>>>
>>>         at ae98498  Implemented: Add 'controlPath' attribute
>>>
>>> No new revisions were added by this update.
>>>

[Pierre Smits-3]

Before something can be documented, we need to know what was done.

Best regards,

Pierre Smits
*Proud* *contributor* (but without privileges)* of* Apache OFBiz
<https://ofbiz.apache.org/>, since 2008

*Apache Trafodion <https://trafodion.apache.org>, Vice President*
*Apache Directory <https://directory.apache.org>, PMC Member*
Apache Incubator <https://incubator.apache.org>, committer
Apache Steve <https://steve.apache.org>, committer


On Wed, Feb 12, 2020 at 12:34 PM Pierre Smits <[hidden email]>
wrote:

> I don't know how this happened, but the result in my local git clone
> (through my client SourceTree) is the following when I do a fetch:
>
> git --no-optional-locks -c color.branch=false -c color.diff=false -c
> color.status=false -c diff.mnemonicprefix=false -c core.quotepath=false -c
> credential.helper=sourcetree fetch --prune OFBiz
>
> fatal: Cannot fetch both refs/pull/13/head and refs/heads/pr/13 to
> refs/remotes/OFBiz/pr/13
>
> Completed with errors, see above
>
>
>
> Best regards,
>
> Pierre Smits
> *Proud* *contributor* (but without privileges)* of* Apache OFBiz
> <https://ofbiz.apache.org/>, since 2008
>
> *Apache Trafodion <https://trafodion.apache.org>, Vice President*
> *Apache Directory <https://directory.apache.org>, PMC Member*
> Apache Incubator <https://incubator.apache.org>, committer
> Apache Steve <https://steve.apache.org>, committer
>
>
> On Wed, Feb 12, 2020 at 12:18 PM [hidden email] <[hidden email]>
> wrote:
>
>> Not sure how and why this happened and what it's for...
>>
>> Do we need to document that?
>>
>> Le 12/02/2020 à 12:11, [hidden email] a écrit :
>> > This is an automated email from the ASF dual-hosted git repository.
>> >
>> > jleroux pushed a change to branch pr/13
>> > in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.
>> >
>> >
>> >        at ae98498  Implemented: Add 'controlPath' attribute
>> >
>> > No new revisions were added by this update.
>> >
>>
>

[Michael Brohl-3]

I guess you made a commit on the PR branch and have your git configured
in a way that a git push does push changes to all remote branches, not
just the one you wanted to.

Regards,

Michael Brohl

ecomify GmbH - www.ecomify.de

Am 12.02.20 um 12:46 schrieb Jacques Le Roux:

> I just made a commit and a push after cherry-picking your commit from
> PR13
>
> Seems OK on OFBiz side
>
> https://gitbox.apache.org/repos/asf?p=ofbiz-framework.git;a=summary
>
> Le 12/02/2020 à 12:34, Pierre Smits a écrit :
>> I don't know how this happened, but the result in my local git clone
>> (through my client SourceTree) is the following when I do a fetch:
>>
>> git --no-optional-locks -c color.branch=false -c color.diff=false -c
>> color.status=false -c diff.mnemonicprefix=false -c
>> core.quotepath=false -c
>> credential.helper=sourcetree fetch --prune OFBiz
>>
>> fatal: Cannot fetch both refs/pull/13/head and refs/heads/pr/13 to
>> refs/remotes/OFBiz/pr/13
>>
>> Completed with errors, see above
>>
>>
>>
>> Best regards,
>>
>> Pierre Smits
>> *Proud* *contributor* (but without privileges)* of* Apache OFBiz
>> <https://ofbiz.apache.org/>, since 2008
>>
>> *Apache Trafodion <https://trafodion.apache.org>, Vice President*
>> *Apache Directory <https://directory.apache.org>, PMC Member*
>> Apache Incubator <https://incubator.apache.org>, committer
>> Apache Steve <https://steve.apache.org>, committer
>>
>>
>> On Wed, Feb 12, 2020 at 12:18 PM [hidden email] <[hidden email]>
>> wrote:
>>
>>> Not sure how and why this happened and what it's for...
>>>
>>> Do we need to document that?
>>>
>>> Le 12/02/2020 à 12:11, [hidden email] a écrit :
>>>> This is an automated email from the ASF dual-hosted git repository.
>>>>
>>>> jleroux pushed a change to branch pr/13
>>>> in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.
>>>>
>>>>
>>>>         at ae98498  Implemented: Add 'controlPath' attribute
>>>>
>>>> No new revisions were added by this update.
>>>>

[Pierre Smits-3]

It seems to me the PR was checked out from the official repo before the
cherry-pick (but Jacques could verify this). And somehow a 'refs/pull/13/head'
was created (and pushed back to the remote).




Best regards,

Pierre Smits
*Proud* *contributor* (but without privileges)* of* Apache OFBiz
<https://ofbiz.apache.org/>, since 2008

*Apache Trafodion <https://trafodion.apache.org>, Vice President*
*Apache Directory <https://directory.apache.org>, PMC Member*
Apache Incubator <https://incubator.apache.org>, committer
Apache Steve <https://steve.apache.org>, committer


On Wed, Feb 12, 2020 at 1:27 PM Michael Brohl <[hidden email]>
wrote:

> I guess you made a commit on the PR branch and have your git configured
> in a way that a git push does push changes to all remote branches, not
> just the one you wanted to.
>
> Regards,
>
> Michael Brohl
>
> ecomify GmbH - www.ecomify.de
>
> Am 12.02.20 um 12:46 schrieb Jacques Le Roux:
> > I just made a commit and a push after cherry-picking your commit from
> > PR13
> >
> > Seems OK on OFBiz side
> >
> > https://gitbox.apache.org/repos/asf?p=ofbiz-framework.git;a=summary
> >
> > Le 12/02/2020 à 12:34, Pierre Smits a écrit :
> >> I don't know how this happened, but the result in my local git clone
> >> (through my client SourceTree) is the following when I do a fetch:
> >>
> >> git --no-optional-locks -c color.branch=false -c color.diff=false -c
> >> color.status=false -c diff.mnemonicprefix=false -c
> >> core.quotepath=false -c
> >> credential.helper=sourcetree fetch --prune OFBiz
> >>
> >> fatal: Cannot fetch both refs/pull/13/head and refs/heads/pr/13 to
> >> refs/remotes/OFBiz/pr/13
> >>
> >> Completed with errors, see above
> >>
> >>
> >>
> >> Best regards,
> >>
> >> Pierre Smits
> >> *Proud* *contributor* (but without privileges)* of* Apache OFBiz
> >> <https://ofbiz.apache.org/>, since 2008
> >>
> >> *Apache Trafodion <https://trafodion.apache.org>, Vice President*
> >> *Apache Directory <https://directory.apache.org>, PMC Member*
> >> Apache Incubator <https://incubator.apache.org>, committer
> >> Apache Steve <https://steve.apache.org>, committer
> >>
> >>
> >> On Wed, Feb 12, 2020 at 12:18 PM [hidden email] <[hidden email]
> >
> >> wrote:
> >>
> >>> Not sure how and why this happened and what it's for...
> >>>
> >>> Do we need to document that?
> >>>
> >>> Le 12/02/2020 à 12:11, [hidden email] a écrit :
> >>>> This is an automated email from the ASF dual-hosted git repository.
> >>>>
> >>>> jleroux pushed a change to branch pr/13
> >>>> in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
> .
> >>>>
> >>>>
> >>>>         at ae98498  Implemented: Add 'controlPath' attribute
> >>>>
> >>>> No new revisions were added by this update.
> >>>>
>
>

[Jacques Le Roux]

Yes, found the same indeed, lessons learned and explained on Slack ofbiz channel and all other related places, for the same of documentation

Thanks Michael

Le 12/02/2020 à 13:27, Michael Brohl a écrit :

> I guess you made a commit on the PR branch and have your git configured in a way that a git push does push changes to all remote branches, not just
> the one you wanted to.
>
> Regards,
>
> Michael Brohl
>
> ecomify GmbH - www.ecomify.de
>
> Am 12.02.20 um 12:46 schrieb Jacques Le Roux:
>> I just made a commit and a push after cherry-picking your commit from PR13
>>
>> Seems OK on OFBiz side
>>
>> https://gitbox.apache.org/repos/asf?p=ofbiz-framework.git;a=summary
>>
>> Le 12/02/2020 à 12:34, Pierre Smits a écrit :
>>> I don't know how this happened, but the result in my local git clone
>>> (through my client SourceTree) is the following when I do a fetch:
>>>
>>> git --no-optional-locks -c color.branch=false -c color.diff=false -c
>>> color.status=false -c diff.mnemonicprefix=false -c core.quotepath=false -c
>>> credential.helper=sourcetree fetch --prune OFBiz
>>>
>>> fatal: Cannot fetch both refs/pull/13/head and refs/heads/pr/13 to
>>> refs/remotes/OFBiz/pr/13
>>>
>>> Completed with errors, see above
>>>
>>>
>>>
>>> Best regards,
>>>
>>> Pierre Smits
>>> *Proud* *contributor* (but without privileges)* of* Apache OFBiz
>>> <https://ofbiz.apache.org/>, since 2008
>>>
>>> *Apache Trafodion <https://trafodion.apache.org>, Vice President*
>>> *Apache Directory <https://directory.apache.org>, PMC Member*
>>> Apache Incubator <https://incubator.apache.org>, committer
>>> Apache Steve <https://steve.apache.org>, committer
>>>
>>>
>>> On Wed, Feb 12, 2020 at 12:18 PM [hidden email] <[hidden email]>
>>> wrote:
>>>
>>>> Not sure how and why this happened and what it's for...
>>>>
>>>> Do we need to document that?
>>>>
>>>> Le 12/02/2020 à 12:11, [hidden email] a écrit :
>>>>> This is an automated email from the ASF dual-hosted git repository.
>>>>>
>>>>> jleroux pushed a change to branch pr/13
>>>>> in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.
>>>>>
>>>>>
>>>>>         at ae98498  Implemented: Add 'controlPath' attribute
>>>>>
>>>>> No new revisions were added by this update.
>>>>>
>