From maksim.yevmenkin at gmail.com Thu Jan 16 16:20:28 2025 From: maksim.yevmenkin at gmail.com (Maksim Yevmenkin) Date: Thu, 16 Jan 2025 08:20:28 -0800 Subject: switching to freenginx Message-ID: Hello, I understand that this isn't strictly a question about Nginx development, but it does relate to it in some way. Let's consider a scenario where you have a private fork of Nginx based on nginx.org, which has been kept relatively in sync with the upstream source. Now, suppose you want to change the upstream source to the version provided by freenginx.org. How would one go about making this switch? Are there any tools available that could simplify the process? Has anyone undertaken a similar transition before? What potential issues or challenges should be anticipated? Thank you, Max From mdounin at mdounin.ru Thu Jan 16 23:20:40 2025 From: mdounin at mdounin.ru (Maxim Dounin) Date: Fri, 17 Jan 2025 02:20:40 +0300 Subject: switching to freenginx In-Reply-To: References: Message-ID: Hello! On Thu, Jan 16, 2025 at 08:20:28AM -0800, Maksim Yevmenkin wrote: > I understand that this isn't strictly a question about Nginx > development, but it does relate to it in some way. > > Let's consider a scenario where you have a private fork of Nginx based > on nginx.org, which has been kept relatively in sync with the upstream > source. Now, suppose you want to change the upstream source to the > version provided by freenginx.org. > > How would one go about making this switch? Are there any tools > available that could simplify the process? Has anyone undertaken a > similar transition before? What potential issues or challenges should > be anticipated? I think this depends heavily on how do you maintain your fork. As long as you maintain the fork as branch(es) you periodically rebase on top of the default branch from the upstream, switching should be trivial - just pull from freenginx.org, rebase on top of the default branch you've pulled (as usual), and strip the old default branch. If you use a Mercurial branch with your changes and merge it with the default branch periodically, switching will require re-merging things if you've merged anything from F5 after freenginx was created (and graft'ing any new changes you've made after such merges). Similarly, pull from freenginx.org, then merge it into your branch before the first F5 merge, then graft any new changes, then strip unneeded branches. Just in case, "hg glog" should be helpful in seeing what happens in the repo. Hope this helps. -- Maxim Dounin http://mdounin.ru/