stanio opened a new pull request, #103:
URL: https://github.com/apache/xalan-java/pull/103
Alternative to #14, as @vlsi suggests reset `master` to
`xalan-j_2_7_1_maint`.
> **Important**
> This PR _should **not**_ be merged from Github's web UI.
Here are the steps I've taken to prepare the source branch:
```
git checkout -b xalanj-2671-master-reset origin/xalan-j_2_7_1_maint
git cherry-pick -m 1 ff6743972a 356ce496fa..92781cb4ce
git cherry-pick --skip
git cherry-pick --skip
```
- I've created a new branch (`xalanj-2671-master-reset`) off of the
`xalan-j_2_7_1_maint` one
- Cherry-picked later additions to the `master` branch:
222095d55ac8352fd08f8fa23869fcd58660cea8...92781cb4ce9f56bed3b3dea8f9000e33193b0512,
excluding 0affa12bb12e45bf681a6e6a918d68884d7e1877 and
356ce496faa80d97ae8a8406e37f6bd994b39233
- Two superfluous merge commits were dropped (`git cherry-pick --skip`)
## Execution
Before anything else, please archive the current state by saving a few tags:
```
git tag trunk-20230301 222095d55a -m "Trunk until 2023-03-01"
git tag master-20231017 origin/master -m "Master until 2023-10-17"
git push origin trunk-20230301 master-20231017
```
Using the prepared `xalanj-2671-master-reset` branch from my fork (visible
in this PR), assuming you've cloned the official repo (`origin`):
```
git remote add stanio https://github.com/stanio/xalan-java.git
git fetch --all
git checkout master
git pull
git reset --hard stanio/xalanj-2671-master-reset
```
Perform whatever sanity checks you can come up with, like looking at the
resulting history graph, file blame annotations, etc. When you're ready:
```
git push --force-with-lease
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@xalan.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@xalan.apache.org
For additional commands, e-mail: dev-h...@xalan.apache.org
