From owner-freebsd-questions@freebsd.org Wed Nov 4 16:41:38 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 A116E4614C0 for ; Wed, 4 Nov 2020 16:41:38 +0000 (UTC) (envelope-from byrnejb@harte-lyne.ca) Received: from mx32.harte-lyne.ca (mx32.harte-lyne.ca [216.185.71.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mx32.harte-lyne.ca", Issuer "CA_HLL_ISSUER_2016" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CRC8x3f4lz40lQ for ; Wed, 4 Nov 2020 16:41:37 +0000 (UTC) (envelope-from byrnejb@harte-lyne.ca) Received: from mx32.harte-lyne.ca (localhost [127.0.32.1]) by mx32.harte-lyne.ca (Postfix) with ESMTP id 076E34D107; Wed, 4 Nov 2020 11:41:36 -0500 (EST) X-Virus-Scanned: amavisd-new at harte-lyne.ca Received: from mx32.harte-lyne.ca ([127.0.32.1]) by mx32.harte-lyne.ca (mx32.harte-lyne.ca [127.0.32.1]) (amavisd-new, port 10024) with ESMTP id jMRyn0WXKXSV; Wed, 4 Nov 2020 11:41:29 -0500 (EST) Received: from webmail.harte-lyne.ca (webmail.hamilton.harte-lyne.ca [216.185.71.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx32.harte-lyne.ca (Postfix) with ESMTPSA id 40AD24D0F9; Wed, 4 Nov 2020 11:41:29 -0500 (EST) Received: from 216.185.71.41 (SquirrelMail authenticated user byrnejb_hll) by webmail.harte-lyne.ca with HTTP; Wed, 4 Nov 2020 11:41:29 -0500 Message-ID: <651f02ce4d0d94922c58178ce7d857a2.squirrel@webmail.harte-lyne.ca> In-Reply-To: References: Date: Wed, 4 Nov 2020 11:41:29 -0500 Subject: Re: simple shell script to compare two dirs recursively From: "James B. Byrne" To: "Per olof Ljungmark" Cc: freebsd-questions@freebsd.org Reply-To: byrnejb@harte-lyne.ca User-Agent: SquirrelMail/1.4.23 [SVN] MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-Rspamd-Queue-Id: 4CRC8x3f4lz40lQ X-Spamd-Bar: ----- X-Spamd-Result: default: False [-5.46 / 15.00]; HAS_REPLYTO(0.00)[byrnejb@harte-lyne.ca]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:216.185.71.0/26]; REPLYTO_ADDR_EQ_FROM(0.00)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; RCVD_IN_DNSWL_MED(-0.20)[216.185.71.32:from]; RCPT_COUNT_TWO(0.00)[2]; HAS_X_PRIO_THREE(0.00)[3]; DKIM_TRACE(0.00)[harte-lyne.ca:+]; DMARC_POLICY_ALLOW(-0.50)[harte-lyne.ca,quarantine]; NEURAL_HAM_SHORT(-0.74)[-0.738]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:12021, ipnet:216.185.64.0/20, country:CA]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.98)[-0.977]; RCVD_COUNT_FIVE(0.00)[5]; R_DKIM_ALLOW(-0.20)[harte-lyne.ca:s=dkim_hll]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.04)[-1.044]; MIME_GOOD(-0.10)[text/plain]; DWL_DNSWL_LOW(-1.00)[harte-lyne.ca:dkim]; TO_MATCH_ENVRCPT_SOME(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 16:41:38 -0000 On Mon, November 2, 2020 16:44, Per olof Ljungmark wrote: > On 2020-11-02 22:06, Ralf Mardorf wrote: > > 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. > Have you considered using Git and employing branches to track the basic plugin against your custom version? With Git if you keep your modified plugin in a branch called master then you can open a branch called pluginupdate. Switch to that branch (git checkout pluginupdate) and install the updated plugin. You can then then use git diff to identify all of the changes the plugin update made to your copy of the master branch. You can fix them in the pluginupdate branch, commit the changes, checkout the master branch and then merge the pluginupdate branch back into master (git merge pluginupdate). Git works by keeping differing views (branches) of the file system and tracking the changes in each view. The only trick is that when you make changes to a tracked file in one view (branch) you must either commit those changes to that branch or stash them in a temporary stack before you can checkout a different branch. -- *** e-Mail is NOT a SECURE channel *** Do NOT transmit sensitive data via e-Mail Unencrypted messages have no legal claim to privacy Do NOT open attachments nor follow links sent by e-Mail James B. Byrne mailto:ByrneJB@Harte-Lyne.ca Harte & Lyne Limited http://www.harte-lyne.ca 9 Brockley Drive vox: +1 905 561 1241 Hamilton, Ontario fax: +1 905 561 0757 Canada L8E 3C3