From owner-freebsd-questions@freebsd.org Wed Nov 4 08:26:05 2020 Return-Path: Delivered-To: freebsd-questions@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0911B455288 for ; Wed, 4 Nov 2020 08:26:05 +0000 (UTC) (envelope-from serpent7776@gmail.com) Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CR0973TKlz4QXR for ; Wed, 4 Nov 2020 08:26:03 +0000 (UTC) (envelope-from serpent7776@gmail.com) Received: by mail-wr1-x432.google.com with SMTP id n15so21107388wrq.2 for ; Wed, 04 Nov 2020 00:26:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=X39ws3gsHvsHPez4Bks+TqfVIwa+YxKo+2k+0WRxDUs=; b=N54fbQGdFlp+W5XUvmAsW9WSy+2kwvGPVbb5KLZdsoW88YVApKfl22LYEkikEM1qaX LVjqNBVY1+XEUrp4ZlsfT33piKdsFgpxO1Rk+YtH0FNcOWAW5xlN0uHX1/PwmK2zbdKH yoDOtwW1Lbc7NNDE2vUi+uP5nmExVLozam2A/hp3/2kvKJBT6LwV9YYEl/rdtTmrbFin LUJIqlH+Bge49/0Ox3a/6FwH30nGM54zHPYUQczjbyregZavD1nBSC/mN8xIs+fu4gU9 CtimmiRj4jsuUa/KtQk9VdsHF29hXHwMA+jF7hHc1v0YpO0sfEGqnT3/qZDHa87tzzeM dDnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X39ws3gsHvsHPez4Bks+TqfVIwa+YxKo+2k+0WRxDUs=; b=iuw3Uo/DP1TYMyakjhq6BvIM8RAjn+vm3I+7WoviO+m2QUI86g4hzf5DL0LhuciT6r FVtieoGathhYngH4vDJ/DM0ajsqX9O/z4EgSryA2f0mnqmzG8eoCTuU3vrOHWj4miQZb +5KU5xEIijZ7bKpvrMG3VdAWfsDYEX/GiYK/3r9qLpe1w4quCdUxIpyExAUSlt1c6YWx dXqvgogtOb2Et29Yld9kiyPAsLH5dP9E8yHIIaY27wfb/S0JsiDXZUX6/MqOOPqFGiu6 d220ZDx14qs77fMtCSSpt0CG9SOK5QR2U89+JJYX0fffJ5s4A5Q4TykLc7X2vPbSynQx Qpgg== X-Gm-Message-State: AOAM531rmixdFFTDLTOuiBCPJyD7EvrBfwoqZDEAyUjCIhUn+dAmnMYQ x7ucPRDIbNX+zcsor18sqz7huzvu7IY= X-Google-Smtp-Source: ABdhPJzunbObq4YyHtAbSKYz5DqT6OxOnnrI9a8iLuvhgRE3HJR5qDI2suv8ynahaLSEnOrn+0yUjg== X-Received: by 2002:adf:ed45:: with SMTP id u5mr29641486wro.48.1604478361165; Wed, 04 Nov 2020 00:26:01 -0800 (PST) Received: from DaemONX (90-156-31-193.internetia.net.pl. [90.156.31.193]) by smtp.gmail.com with ESMTPSA id u195sm1326590wmu.18.2020.11.04.00.26.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 00:26:01 -0800 (PST) Date: Wed, 4 Nov 2020 09:25:18 +0100 From: Serpent7776 To: freebsd-questions@freebsd.org Subject: Re: simple shell script to compare two dirs recursively Message-ID: <20201104092518.3bc59c8b@DaemONX> In-Reply-To: <66b0d570-4e46-7971-5d30-33256feeda55@nethead.se> References: <34dfc85a-b985-e31f-a6b2-cf14f1f56fd2@nethead.se> <20201102220603.3b69f35c@archlinux> <66b0d570-4e46-7971-5d30-33256feeda55@nethead.se> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; amd64-portbld-freebsd11.3) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4CR0973TKlz4QXR X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=N54fbQGd; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of serpent7776@gmail.com designates 2a00:1450:4864:20::432 as permitted sender) smtp.mailfrom=serpent7776@gmail.com X-Spamd-Result: default: False [-2.66 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-0.10)[-0.103]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.02)[-1.016]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.04)[-1.041]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-questions@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::432:from]; MID_RHS_NOT_FQDN(0.50)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-questions] X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Nov 2020 08:26:05 -0000 On Mon, 2 Nov 2020 22:44:40 +0100 Per olof Ljungmark wrote: > It is to keep track of a Wordpress plugin that we must do changes to in > the php code, I'm just trying to figure out a way to apply our changes > after the plugin is updated and our alterations are overwritten. If you want to track changes why not using git? Make two branches: upstream and dev. upstream has code as provided by plugin developer, dev has your custom changes on top of upstream. Every time you add custom changes you do it on dev branch. When you want to update, you checkout upstream, apply update and then rebase dev onto new upstream. -- /* * Serpent7776 */