Page MenuHomePhorge

jeremy.norris (Jeremy Norris)
User

Projects

User does not belong to any projects.

Today

  • Clear sailing ahead.

Tomorrow

  • Clear sailing ahead.

Thursday

  • Clear sailing ahead.

User Details

User Since
Jun 11 2021, 12:43 (67 w, 4 d)
Availability
Available

Recent Activity

Thu, Sep 22

jeremy.norris added a comment to T15026: Create a migration guide to move from Phabricator to Phorge.
In T15026#3073, @avivey wrote:

we've decided to add git reset --hard to the instructions to avoid the merges and simplify the stable issue, avoiding the merge from multiple branches.

Thu, Sep 22, 16:56 · Phorge
jeremy.norris added a comment to T15026: Create a migration guide to move from Phabricator to Phorge.

Are there plans to merge the latest Phacility/stable branch into Phorge/stable branch in order to facilitate upgrades without having local merge commits being created?

Thu, Sep 22, 13:53 · Phorge

Fri, Sep 9

jeremy.norris added a comment to T15026: Create a migration guide to move from Phabricator to Phorge.
In T15026#2840, @avivey wrote:

the Aphlict change sounds simple enough to just add to the migration guide - it's going to happen at the same time for basically everyone anyway.

Edit: Looks like this issue was raised in the PR D25006#216

Fri, Sep 9, 00:58 · Phorge
jeremy.norris added a comment to T15026: Create a migration guide to move from Phabricator to Phorge.

FYI, I believe I was able to create a linear history from Phacility's stable branch with the following:

Phorge:

git checkout master
git remote add phacility https://github.com/phacility/phabricator.git
git fetch phacility
git checkout -b stable_linear phacility/stable
git merge -m "(stable) Promote 2022 Week 37" origin/master

Arcanist:

git checkout master
git remote add phacility https://github.com/phacility/arcanist.git
git fetch phacility
git checkout -b stable_linear phacility/stable
git merge -m "(stable) Promote 2022 Week 37" origin/master

You can view the results on my Github here:
https://github.com/norrisjeremy/phorge/tree/stable_linear
https://github.com/norrisjeremy/arcanist/tree/stable_linear

Fri, Sep 9, 00:34 · Phorge

Thu, Sep 8

jeremy.norris added a comment to T15026: Create a migration guide to move from Phabricator to Phorge.

FYI, I believe I was able to create a linear history from Phacility's stable branch with the following:

Thu, Sep 8, 23:15 · Phorge
jeremy.norris added a comment to T15026: Create a migration guide to move from Phabricator to Phorge.

Since the user base is probably pretty small for stable in Phorge, I wonder if it could just be deleted altogether? And then create a new stable in Phorge, that is based directly off of Phabricator's stable, then perform a squash merge or cherry-pick of Phorge master into the new Phorge stable?
I'm not 100% certain how Evan handled promotions of Phabricator master into stable (if he just cherry-picked, or he used squash merges or something different altogether)?

Thu, Sep 8, 17:48 · Phorge
jeremy.norris added a comment to T15026: Create a migration guide to move from Phabricator to Phorge.

The master branch in Phorge is linear with respect to Phabricator's master branch, but it looks like the stable branch in Phorge was created by branching it directly from the tip of Phorge's master, instead of using Phabricator's stable branch as the basis.
It looks to me that Phabricator was cherry-picking their master to their stable, so the changeset history wasn't directly linear with their master (hopefully that makes sense?).
So the directions from the migration guide end up creating a huge local merge commit when followed if you were tracking Phabricator's stable branch.

Thu, Sep 8, 15:33 · Phorge
jeremy.norris added a comment to T15026: Create a migration guide to move from Phabricator to Phorge.

Also, should the migration guide & installation guide point users to the Github mirrors?
This might help avoid undo load on we.phorge.it?
I'll note that the Phabricator installation guide always pointed users to the Github mirrors as well.

Thu, Sep 8, 11:33 · Phorge
jeremy.norris added a comment to T15026: Create a migration guide to move from Phabricator to Phorge.

FYI, the guide for migration doesn't seem to work quite smoothly for folks that were tracking the stable branch for Phabricator, because the new stable branch in Phorge does not have a linear changeset history to the old stable branch in Phabricator: if you follow the directions, you end up with a locally divergent stable branch that will contain a local merge commit.
Is there a reason the stable branch in Phorge wasn't created based upon the changeset history of the stable branch in Phabricator, in order to avoid this from happening?

Thu, Sep 8, 11:23 · Phorge

Wed, Sep 7

jeremy.norris added a comment to T15046: Add GitHub mirrors for repos.

It appears there are not any public repositories yet, is this intentional?

Wed, Sep 7, 11:26 · Nuance, Phorge Upstream, Diffusion
jeremy.norris added a comment to T15046: Add GitHub mirrors for repos.

It appears there are not any public repositories yet, is this intentional?

Wed, Sep 7, 11:24 · Nuance, Phorge Upstream, Diffusion

Dec 13 2021

jeremy.norris added a comment to T15064: Make phorge compatible with PHP 8.1.

https://secure.phabricator.com/w/changelog/2021.50/

Dec 13 2021, 13:46 · Phorge

Dec 9 2021

jeremy.norris added a comment to T15064: Make phorge compatible with PHP 8.1.

There were more upstream changes made a week ago, https://secure.phabricator.com/w/changelog/2021.49/, that included improved PHP8 compatibility...

Dec 9 2021, 16:07 · Phorge
jeremy.norris added a comment to T15064: Make phorge compatible with PHP 8.1.

Wouldn't a massive changeset like this greatly increase difficulty of performing future merges of upstream (secure.phabricator.com)?

Dec 9 2021, 15:31 · Phorge