Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: BaseXdb/basex
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: mblink/basex-webapp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: webapp
Choose a head ref

There isn’t anything to compare.

BaseXdb:main and mblink:webapp are entirely different commit histories.

Showing with 9 additions and 40 deletions.
  1. +9 −40 README.md
49 changes: 9 additions & 40 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# basex-webapp

This is a slightly tweaked version of the BaseX Database Admin web app to allow acces to non-admin users.
The current version is based on [BaseX v10.7](https://github.com/BaseXdb/basex/tree/10.7/basex-api/src/main/webapp).
The current version is based on [BaseX v11.5](https://github.com/BaseXdb/basex/tree/11.5/basex-api/src/main/webapp).

You can view the changes applied by looking at the diff between the `upstream-webapp` branch and a version-specific branch,
e.g. https://github.com/mblink/basex-webapp/compare/upstream-webapp...webapp-10.7
e.g. https://github.com/mblink/basex-webapp/compare/upstream-webapp...webapp-11.5

## Setup

@@ -18,42 +18,11 @@ git remote add upstream git@github.com:BaseXdb/basex

## Updating

To update to a newer version of BaseX, find the branch named after the current latest version, e.g. `basex-10.6`,
then run the following commands:
To update to a newer version of BaseX:

```bash
# Checkout the upstream-master branch and pull to make sure it's up to date
git checkout upstream-master
git pull origin upstream-master

# Fetch from the upstream remote
git fetch upstream
git fetch upstream --tags

# Reset the current state to the desired version tag
git reset --hard <x.y.z>

# Push the upstream-master branch to origin
git push origin upstream-master

# Split the webapp subtree and apply the commits to the upstream-webapp branch
git subtree split --prefix basex-api/src/main/webapp --onto upstream-webapp -b upstream-webapp

# Checkout and push the upstream-webapp branch to origin
git checkout upstream-webapp
git push origin upstream-webapp

# Replace with version from the latest branch
currBranch='webapp-10.6'
# Replace with the version you're updating to
updBranch='webapp-10.7'

git checkout "$currBranch"
git pull origin "$currBranch"
# Checkout a new branch with the updated version
git checkout -b "$updBranch"
# Merge upstream-webapp, resolve conflicts and commit if necessary
git merge upstream-webapp
# Push the new branch to origin
git push origin "$updBranch"
```
1. Run `bash +x update-version.sh <old-version> <new-version>`
1. Note: the versions you pass should match [tags in the BaseX repo](https://github.com/BaseXdb/basex/tags)
2. Follow the instructions printed at the end of the script to:
1. Resolve any conflicts
2. Complete the merge
3. Push the new version's branch