FYI, I believe I'm encountering similar issues. Our organization just switched to a new email domain hosted on Microsoft 365 and when attempting to add the new email address to my account on this installation, I do not receive an email with the confirmation link.
- Queries
- All Stories
- Search
- Advanced Search
- Transactions
- Transaction Logs
Advanced Search
Dec 5 2022
Oct 7 2022
Sep 22 2022
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.
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?
Sep 9 2022
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
In T15026#2841, @jeremy.norris wrote: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/masterArcanist:
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/masterYou can view the results on my Github here:
https://github.com/norrisjeremy/phorge/tree/stable_linear
https://github.com/norrisjeremy/arcanist/tree/stable_linear
Sep 8 2022
FYI, I believe I was able to create a linear history from Phacility's stable branch with the following:
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)?
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.
Also, should the migration guide & installation guide point users to the Github mirrors?
This might help avoid undue load on we.phorge.it?
I'll note that the Phabricator installation guide always pointed users to the Github mirrors as well.
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?
Sep 7 2022
In T15046#2761, @jeremy.norris wrote:It appears there are not any public repositories yet, is this intentional?
It appears there are not any public repositories yet, is this intentional?
Dec 13 2021
Dec 9 2021
There were more upstream changes made a week ago, https://secure.phabricator.com/w/changelog/2021.49/, that included improved PHP8 compatibility...
Wouldn't a massive changeset like this greatly increase difficulty of performing future merges of upstream (secure.phabricator.com)?