From owner-freebsd-questions@freebsd.org Mon Nov 2 22:48:34 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 5CA1745D359 for ; Mon, 2 Nov 2020 22:48:34 +0000 (UTC) (envelope-from freebsd-questions-local@be-well.ilk.org) Received: from be-well.ilk.org (be-well.ilk.org [23.30.133.173]) by mx1.freebsd.org (Postfix) with ESMTP id 4CQ7PD5b0mz47K1 for ; Mon, 2 Nov 2020 22:48:32 +0000 (UTC) (envelope-from freebsd-questions-local@be-well.ilk.org) Received: from lowell-desk.be-well.ilk.org (router.lan [172.30.250.2]) by be-well.ilk.org (Postfix) with ESMTP id 7A50733C25; Mon, 2 Nov 2020 17:48:20 -0500 (EST) Received: by lowell-desk.be-well.ilk.org (Postfix, from userid 1147) id 09FC2163251E; Mon, 2 Nov 2020 17:48:17 -0500 (EST) From: Lowell Gilbert To: Per olof Ljungmark Cc: freebsd-questions@freebsd.org Subject: Re: simple shell script to compare two dirs recursively References: <34dfc85a-b985-e31f-a6b2-cf14f1f56fd2@nethead.se> <20201102220603.3b69f35c@archlinux> <66b0d570-4e46-7971-5d30-33256feeda55@nethead.se> Reply-To: freebsd-questions@freebsd.org Date: Mon, 02 Nov 2020 17:48:17 -0500 In-Reply-To: <66b0d570-4e46-7971-5d30-33256feeda55@nethead.se> (Per olof Ljungmark's message of "Mon, 2 Nov 2020 22:44:40 +0100") Message-ID: <44y2jjwf2m.fsf@be-well.ilk.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: 4CQ7PD5b0mz47K1 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of freebsd-questions-local@be-well.ilk.org has no SPF policy when checking 23.30.133.173) smtp.mailfrom=freebsd-questions-local@be-well.ilk.org X-Spamd-Result: default: False [-0.11 / 15.00]; HAS_REPLYTO(0.00)[freebsd-questions@freebsd.org]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_MEDIUM(-0.16)[-0.164]; NEURAL_HAM_LONG(-0.43)[-0.435]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; DMARC_NA(0.00)[ilk.org]; AUTH_NA(1.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.51)[-0.514]; RCPT_COUNT_TWO(0.00)[2]; R_SPF_NA(0.00)[no SPF record]; RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:7922, ipnet:23.30.0.0/15, country:US]; RCVD_COUNT_TWO(0.00)[2]; 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: Mon, 02 Nov 2020 22:48:34 -0000 Per olof Ljungmark writes: > Thank you for your responses. > > 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. > > In a way that is simple, that is. "Simple" can be in the eye of the beholder. "diff -r" is pretty simple for a lot of cases. There are a lot of other diff-like tools, each with its own features... For cases like this description (tracking local changes to a third-party piece of code), my first instinct is to use a version control system, but I'm already familiar with how to do that in my environments.