From 969f6a60c3f4c521ba25aea72d130b3353fd95da Mon Sep 17 00:00:00 2001 From: Thomas Adam <thomas.adam22@gmail.com> Date: Fri, 21 Mar 2025 12:46:06 +0000 Subject: [PATCH] portable: SYNCING: correct tmux-openbsd The tmux-openbsd repository is called tmux-obsd. Noticed via Github issue #4419 --- SYNCING | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/SYNCING b/SYNCING index 07be40c4..51b78010 100644 --- a/SYNCING +++ b/SYNCING @@ -1,17 +1,17 @@ Preamble ======== -Tmux portable relies on repositories "tmux" and "tmux-openbsd". +Tmux portable relies on repositories "tmux" and "tmux-obsd". Here's a description of them: * "tmux" is the portable version, the one which contains code for other operating systems, and autotools, etc., which isn't found or needed in the OpenBSD base system. -* "tmux-openbsd" is the version of tmux in OpenBSD base system which provides +* "tmux-obsd" is the version of tmux in OpenBSD base system which provides the basis of the portable tmux version. -Note: The "tmux-openbsd" repository is actually handled by "git cvsimport" +Note: The "tmux-obsd" repository is actually handled by "git cvsimport" running at 15 minute intervals, so a commit made to OpenBSD's tmux CVS repository will take at least that long to appear in this git repository. (It might take longer, depending on the CVS mirror used to import the @@ -34,11 +34,11 @@ this information has ever been set before. Cloning repositories ==================== -This involves having both tmux and tmux-openbsd cloned, as in: +This involves having both tmux and tmux-obsd cloned, as in: % cd /some/where/useful % git clone https://github.com/tmux/tmux.git -% git clone https://github.com/ThomasAdam/tmux-openbsd.git +% git clone https://github.com/ThomasAdam/tmux-obsd.git Note that you do not need additional checkouts to manage the sync -- an existing clone of either repositories will suffice. So if you already have @@ -47,30 +47,30 @@ these checkouts existing, skip that. Adding in git-remotes ===================== -Because the portable "tmux" git repository and the "tmux-openbsd" +Because the portable "tmux" git repository and the "tmux-obsd" repository do not inherently share any history between each other, the history has been faked between them. This "faking of history" is something which has to be told to git for the purposes of comparing the "tmux" and -"tmux-openbsd" repositories for syncing. To do this, we must reference the -clone of the "tmux-openbsd" repository from the "tmux" repository, as +"tmux-obsd" repositories for syncing. To do this, we must reference the +clone of the "tmux-obsd" repository from the "tmux" repository, as shown by the following command: % cd /path/to/tmux -% git remote add obsd-tmux file:///path/to/tmux-openbsd +% git remote add obsd-tmux file:///path/to/tmux-obsd So that now, the remote "obsd-tmux" can be used to reference branches and -commits from the "tmux-openbsd" repository, but from the context of the +commits from the "tmux-obsd" repository, but from the context of the portable "tmux" repository, which makes sense because it's the "tmux" repository which will have the updates applied to them. Fetching updates ================ -To ensure the latest commits from "tmux-openbsd" can be found from within -"tmux", we have to ensure the "master" branch from "tmux-openbsd" is +To ensure the latest commits from "tmux-obsd" can be found from within +"tmux", we have to ensure the "master" branch from "tmux-obsd" is up-to-date first, and then reference that update in "tmux", as in: -% cd /path/to/tmux-openbsd +% cd /path/to/tmux-obsd % git checkout master % git pull @@ -82,9 +82,9 @@ Then back in "tmux": Creating the necessary branches =============================== -Now that "tmux" can see commits and branches from "tmux-openbsd" by way +Now that "tmux" can see commits and branches from "tmux-obsd" by way of the remote name "obsd-tmux", we can now create the master branch from -"tmux-openbsd" in the "tmux" repository: +"tmux-obsd" in the "tmux" repository: % git checkout -b obsd-master obsd-tmux/master @@ -92,7 +92,7 @@ Adding in the fake history points ================================= To tie both the "master" branch from "tmux" and the "obsd-master" -branch from "tmux-openbsd" together, the fake history points added to the +branch from "tmux-obsd" together, the fake history points added to the "tmux" repository need to be added. To do this, we must add an additional refspec line, as in: