You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@netbeans.apache.org by Ernie Rael <er...@raelity.com> on 2020/09/02 21:48:16 UTC
default master
Hi all, Neil,
If I go to https://github.com/apache/netbeans/branches
I see master updated 10 days ago
and release121 updated 9 days ago.
I ask because I just did a pull and locally I'm seeing default/master
without 12.1 stuff.
Is it my local setup?
-ernie
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: default master
Posted by Neil C Smith <ne...@apache.org>.
On Thu, 3 Sep 2020 at 00:05, Ernie Rael <er...@raelity.com> wrote:
> Uhhhh. OK, I didn't look carefully enough. I'll rebase my in-progress
> pull requests against "upstream/master". If things change and
> "default/master", becomes the spot, I'll deal with it then.
I'm not sure what default/master is in this context - presumably
equivalent to origin master. In which case, this is expected.
So I have two remotes in git, origin and upstream - output of git remote -v is
origin https://github.com/neilcsmith-net/netbeans.git (fetch)
origin https://github.com/neilcsmith-net/netbeans.git (push)
upstream https://github.com/apache/netbeans.git (fetch)
upstream DISABLED (push)
The origin repository branches do not pick up changes from upstream
automatically. So you usually need to pull master from upstream and
push to your origin / default on a regular basis to keep it
up-to-date.
You'll also see there that I have got in the habit of setting push-url
to DISABLED on upstream repositories.
Best wishes,
Neil
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: default master
Posted by Ernie Rael <er...@raelity.com>.
On 9/2/2020 2:56 PM, Neil C Smith wrote:
> On Wed, 2 Sep 2020, 22:48 Ernie Rael, <er...@raelity.com> wrote:
>
>> If I go to https://github.com/apache/netbeans/branches
>>
>> I see master updated 10 days ago
>>
>> and release121 updated 9 days ago.
>>
>> I ask because I just did a pull and locally I'm seeing default/master
>> without 12.1 stuff.
>>
>> Is it my local setup?
>>
> Sure you're pulling from right remote?!
>
> Release branches differ from master by the sync pull requests used to pull
> commits across. Eg. HEAD on master is HEAD~1 on release121, hence the 9 vs
> 10 days ago. Other than that, they're still the same until we reopen master
> in a few days - just sorting signature tests and module versions before we
> can do that.
Uhhhh. OK, I didn't look carefully enough. I'll rebase my in-progress
pull requests against "upstream/master". If things change and
"default/master", becomes the spot, I'll deal with it then. Since I
don't know git at all, I'm never quite sure if what I'm seeing is more
git than mercurial's interpretation of git.
Thanks,
-ernie
...
o changeset: 4616:b637d348f7e2
|\ bookmark: release121
| | tag: 12.1
| | tag: 12.1-beta4
| | tag: 12.1-vc1
| | tag: upstream/release121
| | parent: 4599:85d72a2dbdf3
| | parent: 4615:6e62e60f9472
| | user: Neil C Smith <ne...@apache.org>
| | date: Mon Aug 24 15:09:25 2020 +0100
| | summary: Merge pull request #2330 from apache/master
| |
| @ changeset: 4615:6e62e60f9472
| |\ tag: upstream/master
| | | parent: 4613:5fe737b19146
| | | parent: 4614:018b30ed447f
| | | user: Neil C Smith <ne...@apache.org>
| | | date: Mon Aug 24 09:55:20 2020 +0100
| | | summary: Merge pull request #2326 from
DevCharly/flatlaf-tasks-background-fix
...
| o | changeset: 4589:eee6c5679c67
| |\ \ tag: default/master
| | | | parent: 4587:e0efc5832b7b
| | | | parent: 4588:1f51eca0b754
| | | | user: Neil C Smith <ne...@apache.org>
| | | | date: Thu Aug 13 13:39:58 2020 +0100
| | | | summary: Merge pull request #2308 from
matthiasblaesing/html-validator-fix
>
> Best wishes,
>
> Neil
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: default master
Posted by Neil C Smith <ne...@apache.org>.
On Wed, 2 Sep 2020, 22:48 Ernie Rael, <er...@raelity.com> wrote:
> If I go to https://github.com/apache/netbeans/branches
>
> I see master updated 10 days ago
>
> and release121 updated 9 days ago.
>
> I ask because I just did a pull and locally I'm seeing default/master
> without 12.1 stuff.
>
> Is it my local setup?
>
Sure you're pulling from right remote?!
Release branches differ from master by the sync pull requests used to pull
commits across. Eg. HEAD on master is HEAD~1 on release121, hence the 9 vs
10 days ago. Other than that, they're still the same until we reopen master
in a few days - just sorting signature tests and module versions before we
can do that.
Best wishes,
Neil
>