This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 17ac945 SOLR-15818 Fix branch_8x mention (#431)
17ac945 is described below
commit 17ac945233ed462a27941b4434a8b250b581ed87
Author: Jan Høydahl <[email protected]>
AuthorDate: Fri Dec 3 19:35:54 2021 +0100
SOLR-15818 Fix branch_8x mention (#431)
---
dev-docs/cloud-script.adoc | 2 +-
dev-docs/working-between-major-versions.adoc | 17 ++++++++---------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/dev-docs/cloud-script.adoc b/dev-docs/cloud-script.adoc
index 3ff9c7f..9ca87de 100644
--- a/dev-docs/cloud-script.adoc
+++ b/dev-docs/cloud-script.adoc
@@ -16,7 +16,7 @@ NOTE: This script only supports POSIX environments. There is
no similar .bat scr
Typical usage of the script is:
1. Copy the script to a location outside the `./solr/` working copy such as
`<GIT_CHECKOUT>/../solr-testing`. Trying to use it from within the working copy
will leave you fighting version control to avoid checking in files.
-2. Edit the script to provide a proper back reference to your working copy for
`DEFAULT_VCS_WORKSPACE` (the default is `../code/lucene-solr`)
+2. Edit the script to provide a proper back reference to your working copy for
`DEFAULT_VCS_WORKSPACE` (the default is `../code/solr`)
3. Start a local zookeeper instance. This zookeeper must be running on
localhost, but the port can be adjusted with a `-z` option passed to the
script. `docker run -p 2181:2181 zookeeper` is one option to start up a local
Zookeeper.
4. run ./cloud.sh new -r
diff --git a/dev-docs/working-between-major-versions.adoc
b/dev-docs/working-between-major-versions.adoc
index 49c45b7..4c41fb8 100644
--- a/dev-docs/working-between-major-versions.adoc
+++ b/dev-docs/working-between-major-versions.adoc
@@ -27,9 +27,9 @@ These orphaned files can impact the use of `precommit`,
IntelliJ, and other tool
https://git-scm.com/docs/git-worktree[Git worktree] is a feature of git that
allows you to have different directories store separate checkouts of the same
repository, at the same time.
The git metadata is shared between the different directories, so any remotes
added or local commits made from one worktree are available to all other
worktrees as well.
-For Solr, this allows us to have separate directories (worktrees) that manage
the checkouts of `main` and `branch_8x` (or any other major branch).
-One can make a commit on `main`, then easily switch directories and
cherry-pick the commit onto `branch_8x` without having to worry about gradle or
ant files.
-This setup also allows the commit to be tested on `main` and `branch_8x`
simultaneously.
+For Solr, this allows us to have separate directories (worktrees) that manage
the checkouts of `main` and stable or release branches, if those e.g. require
different Java versions or build setup.
+One can make a commit on `main`, then easily switch directories and
cherry-pick the commit onto the stable branch without having to worry about
compatibility.
+This setup also allows the commit to be tested on `main` and release branch
simultaneously.
=== Setup
@@ -43,15 +43,14 @@ This folder is not a git folder however. Instead, it will
hold all of our solr g
```bash
cd solr
-# "Main" will be the main lucene-solr checkout, that all worktrees stem from.
+# "Main" will be the main solr checkout, that all worktrees stem from.
git clone [email protected]:apache/solr.git main
cd main
-# For older versions we need to add the older lucene-solr repository as a
remote
-git remote add -f lucene-solr [email protected]:apache/lucene-solr.git
# For each branch that you want a separate directory created for, add a
worktree
-git worktree add ../8x lucene-solr/branch_8x
-# If you plan on working on older versions of Solr as well, make worktrees for
them too
-git worktree add ../7x lucene-solr/branch_7x
+git worktree add ../9x branch_9x
+# For making bugfixes to the 8.11.x line, we need to add the older lucene-solr
repository as a remote
+git remote add -f lucene-solr [email protected]:apache/lucene-solr.git
+git worktree add ../8_11 lucene-solr/branch_8_11
```
=== Using the Worktrees
